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

@@ -90,4 +90,9 @@ public class GridPartyMemberDataFormDTO implements Serializable {
      * 党员自建群活跃群众人数(08-24)
 	 */
     private Integer groupActiveUserCount;
+
+    /**
+     * 用户id
+     */
+    private String userId;
 }

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

@@ -0,0 +1,67 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 18、公众参与各类总数 入参
+ * 公众参与-各类(用户|党员|党群|话题|议题|项目|注册人数|参与人数)总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class PublicPartiTotalDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织类别 agency：组织；网格：grid
+     */
+    private String orgType;
+
+    /**
+     * 组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     * 上级组织Id，如果是网格，传入网格所属的组织id
+     */
+    private String parentId;
+
+    /**
+     * 组织名称(可以是网格名称，也可以是组织名称)
+     */
+    private String orgName;
+
+    /**
+     * 话题总数
+     */
+    private Integer topicTotal;
+
+    /**
+     * 议题总数
+     */
+    private Integer issueTotal;
+
+    /**
+     * 注册人数
+     */
+    private Integer regUserTotal;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectTotal;
+
+    /**
+     * 参与人数
+     */
+    private Integer joinUserTotal;
+
+    /**
+     * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
+     */
+    private String dataEndTime;
+}

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

@@ -68,14 +68,4 @@ public class UserTotalDataFormDTO implements Serializable {
      * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
      */
     private String dataEndTime;
-
-    /**
-     * 注册人数（08-21新增）
-     */
-    private Integer regUserTotal;
-
-    /**
-     * 参与人数（08-21新增）
-     */
-    private Integer joinUserTotal;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java

@@ -36,11 +36,12 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
 
     /**
      * 1、党建能力-党员相关指标上报(按照月份)
-     *    1) 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、USER_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
      *
      * @param customerId
      * @param agencyId
      * @param gridId
+     * @param userId
      * @param yearId
      * @param monthId
      * @param quarterId
@@ -50,6 +51,7 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
     void deleteFactIndexPartyAblityCpcMonthly(@Param("customerId") String customerId,
                                               @Param("agencyId") String agencyId,
                                               @Param("gridId") String gridId,
+                                              @Param("userId") String userId,
                                               @Param("yearId") String yearId,
                                               @Param("monthId") String monthId,
                                               @Param("quarterId") String quarterId);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/FactIndexCollectService.java

@@ -14,7 +14,7 @@ public interface FactIndexCollectService {
 
     /**
      * 1、党建能力-党员相关指标上报(按照月份)
-     *    根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    根据CUSTOMER_ID、AGENCY_ID、GRID_ID、USER_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
      *
      * @param formDTO
      * @param customerId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java

@@ -43,7 +43,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         if (null != formDTO && formDTO.size() > NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
                 factIndexPartyAblityCpcMonthlyDao.deleteFactIndexPartyAblityCpcMonthly(customerId,
-                        formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(),
+                        formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(), formDTO.get(i).getUserId(),
                         formDTO.get(i).getYearId(), formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId());
             }
             factIndexPartyAblityCpcMonthlyDao.batchInsertFactIndexPartyAblityCpcMonthly(formDTO, customerId);

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

@@ -27,6 +27,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="userId" column="USER_ID"/>
     </resultMap>
 
     <delete id="deleteFactIndexPartyAblityCpcMonthly">
@@ -60,7 +61,8 @@
         CREATED_BY,
         CREATED_TIME,
         UPDATED_BY,
-        UPDATED_TIME
+        UPDATED_TIME,
+        USER_ID
         ) values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -86,7 +88,8 @@
             'APP_USER',
             now(),
             'APP_USER',
-            now()
+            now(),
+            #{item.userId}
             )
         </foreach>
     </insert>

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

@@ -28,8 +28,6 @@
         TOPIC_TOTAL,
         ISSUE_TOTAL,
         PROJECT_TOTAL,
-        REG_USER_TOTAL,
-        JOIN_USER_TOTAL,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -52,8 +50,6 @@
             #{item.topicTotal},
             #{item.issueTotal},
             #{item.projectTotal},
-            #{item.regUserTotal},
-            #{item.joinUserTotal},
             0,
             0,
             'APP_USER',