独联体-添加公会信息

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildMemberSovietAdminVo.java

@@ -27,6 +27,10 @@ public class GuildMemberSovietAdminVo {
     @ApiModelProperty("用户ID")
     private Long erbanNo;
 
+    @ExcelProperty("公会长ID")
+    @ApiModelProperty("公会长ID")
+    private Long ownerErbanNo;
+
     @ExcelProperty("用户UID")
     @ApiModelProperty("用户UID")
     private Long uid;

accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guildsoviet/GuildExtraDiamondDayMapper.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 公会钻石流水额外收入记录 Mapper 接口
@@ -42,7 +43,7 @@ public interface GuildExtraDiamondDayMapper extends BaseMapper<GuildExtraDiamond
     Page<GuildSovietAdminVo> pageGuildSovietAdminVo(@Param("page") Page<GuildSovietAdminVo> page, @Param("partitionId") Integer partitionId, @Param("guildId") Integer guildId,
                                                     @Param("uid") Long uid, @Param("regionId") Integer regionId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
-    Page<GuildMemberSovietAdminVo> pageGuildMemberSovietAdminVo(@Param("page") Page<GuildSovietAdminVo> page, @Param("partitionId") Integer partitionId,
+    Page<GuildMemberSovietAdminVo> pageGuildMemberSovietAdminVo(@Param("page") Page<GuildSovietAdminVo> page, @Param("guildIdSet") Set<Integer> guildIdSet, @Param("partitionId") Integer partitionId,
                                                                 @Param("uid") Long uid, @Param("regionId") Integer regionId, @Param("enable") Byte enable,
                                                                 @Param("startDate") String startDate, @Param("endDate") String endDate);
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildsoviet/GuildExtraDiamondDayService.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 公会钻石流水额外收入记录 服务实现类
@@ -74,8 +75,8 @@ public class GuildExtraDiamondDayService extends ServiceImpl<GuildExtraDiamondDa
         return baseMapper.pageGuildSovietAdminVo(page, partitionId, guildId, uid, regionId, beginDate, endDate);
     }
 
-    public Page<GuildMemberSovietAdminVo> pageGuildMemberSovietAdminVo(Page<GuildSovietAdminVo> page, Integer partitionId, Long uid,
+    public Page<GuildMemberSovietAdminVo> pageGuildMemberSovietAdminVo(Page<GuildSovietAdminVo> page, Set<Integer> guildIdSet, Integer partitionId, Long uid,
                                                                        Integer regionId, Byte enable, String beginDate, String endDate) {
-        return baseMapper.pageGuildMemberSovietAdminVo(page, partitionId, uid, regionId, enable, beginDate, endDate);
+        return baseMapper.pageGuildMemberSovietAdminVo(page, guildIdSet, partitionId, uid, regionId, enable, beginDate, endDate);
     }
 }

accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildExtraDiamondDayMapper.xml

@@ -129,6 +129,7 @@
             ge.stat_date statDate,
             gm.guild_id guildId,
             u.erban_no erbanNo,
+            gu.erban_no ownerErbanNo,
             u.uid uid,
             u.nick nick,
             r.`name` regionName,
@@ -140,6 +141,8 @@
             sum(owner_extra_num + owner_extra_lucky_num) guildExtraDiamondNum
         from guild_extra_diamond_day ge
         left join guild_member gm on ge.guild_member_id = gm.id
+        left join guild g on ge.guild_id = g.id
+        left join users gu on g.owner_uid = gu.uid
         left join users u on ge.uid = u.uid
         left join region_info r on u.region_id = r.id
         where
@@ -159,6 +162,11 @@
             <if test="endDate != null and endDate != ''">
                 and ge.stat_date &lt;= #{endDate}
             </if>
+        <if test="guildIdSet != null and guildIdSet.size() > 0">
+            <foreach item="item" index="index" collection="guildIdSet" open="and ge.guild_id in(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         group by ge.partition_id,ge.stat_date, ge.guild_member_id
         order by statDate desc
     </select>