From b17b7c6c64e478de5130bde54b2c0b9deb013d6c Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 24 Aug 2020 16:49:59 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=9A=E5=BB=BA=E8=83=BD=E5=8A=9B-?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3=E6=8C=87=E6=A0=87=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=20-=20=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexcollect/form/GridPartyMemberDataFormDTO.java  | 10 +++++-----
 .../indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
index 7993cb2355..ffdc7554cd 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
+++ b/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;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
index 836adcdb03..c967efd5fe 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
+++ b/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',