Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java

@@ -50,6 +50,16 @@ public class UserJoinFormDTO implements Serializable {
      */
     private BigDecimal avgIssue;
 
+    /**
+     * 人均议题分子
+     */
+    private Integer avgIssueFz;
+
+    /**
+     * 人均议题分母
+     */
+    private Integer avgIssueFm;
+
     /**
      * 总的参与次数
      */
@@ -59,4 +69,14 @@ public class UserJoinFormDTO implements Serializable {
      * 平均参与度
      */
     private BigDecimal avgJoin;
+
+    /**
+     * 平均参与度分子
+     */
+    private Integer avgJoinFz;
+
+    /**
+     * 平均参与度分母
+     */
+    private Integer avgJoinFm;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenUserJoinEntity.java

@@ -92,6 +92,16 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity {
      */
     private BigDecimal avgIssue;
 
+    /**
+     * 人均议题分子
+     */
+    private Integer avgIssueFz;
+
+    /**
+     * 人均议题分母
+     */
+    private Integer avgIssueFm;
+
     /**
      * 人均议题较上月增长率(采集的时候后台自己计算)
      */
@@ -107,6 +117,16 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity {
      */
     private BigDecimal avgJoin;
 
+    /**
+     * 平均参与度分子
+     */
+    private Integer avgJoinFz;
+
+    /**
+     * 平均参与度分母
+     */
+    private Integer avgJoinFm;
+
     /**
      * 平均参与度较上月增长率(采集的时候后台自己计算)
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -219,7 +219,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                 List<IssueVoteUserCountResultDTO> voteCountList = factOriginIssueLogDailyService.getVoteCount(formDTO.getCustomerId(), formDTO.getMonthId(), ProjectConstant.AGENCY_ID);
                 Map<String, Integer> orgMemberCount = new HashMap<>();
                 if (!CollectionUtils.isEmpty(issueTotal)) {
-                    //获取每个网格的应表决人数
+                    //获取每个网格的应表决人数 （组成员数去重）
                     List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
                     if (CollectionUtils.isEmpty(memberCountList)) {
                         log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,customerId:{}", formDTO.getCustomerId());

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserJoinDao.xml

@@ -41,9 +41,13 @@
         JOIN_TOTAL_UP_RATE,
         JOIN_TOTAL_UP_FLAG,
         AVG_ISSUE,
+        AVG_ISSUE_FZ,
+        AVG_ISSUE_FM,
         AVG_ISSUE_UP_RATE,
         AVG_ISSUE_UP_FLAG,
         AVG_JOIN,
+        AVG_JOIN_FZ,
+        AVG_JOIN_FM,
         AGVG_JOIN_UP_RATE,
         AGVG_JOIN_UP_FLAG,
         DEL_FLAG,
@@ -69,10 +73,14 @@
             #{item.joinTotalUpFlag},
 
             #{item.avgIssue},
+            #{item.avgIssueFz},
+            #{item.avgIssueFm},
             #{item.avgIssueUpRate},
             #{item.avgIssueUpFlag},
 
             #{item.avgJoin},
+            #{item.avgIssueFz},
+            #{item.avgIssueFm},
             #{item.agvgJoinUpRate},
             #{item.agvgJoinUpFlag},
             0,