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

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java

@@ -81,11 +81,6 @@ public class GridPartyMemberDataFormDTO implements Serializable {
      */
     private BigDecimal topicToIssueRatio;
 
-    /**
-     * 提出的议题转项目数
-     */
-    private Integer issueToProjectCount;
-
     /**
      * 用户id
      */
@@ -95,4 +90,9 @@ public class GridPartyMemberDataFormDTO implements Serializable {
      * 上级组织Id
      */
     private String parentId;
+
+    /**
+     * 党员自建群活跃群众人数(08-24)
+	 */
+    private Integer groupActiveUserCount;
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml

@@ -21,7 +21,7 @@
         <result property="groupUserCount" column="GROUP_USER_COUNT"/>
         <result property="groupTopicCount" column="GROUP_TOPIC_COUNT"/>
         <result property="topicToIssueRatio" column="TOPIC_TO_ISSUE_RATIO"/>
-        <result property="issueToProjectCount" column="ISSUE_TO_PROJECT_COUNT"/>
+        <result property="groupActiveUserCount" column="GROUP_ACTIVE_USER_COUNT"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -56,7 +56,7 @@
         GROUP_USER_COUNT,
         GROUP_TOPIC_COUNT,
         TOPIC_TO_ISSUE_RATIO,
-        ISSUE_TO_PROJECT_COUNT,
+        GROUP_ACTIVE_USER_COUNT,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -83,7 +83,7 @@
             #{item.groupUserCount},
             #{item.groupTopicCount},
             #{item.topicToIssueRatio},
-            #{item.issueToProjectCount},
+            #{item.groupActiveUserCount},
             0,
             0,
             'APP_USER',