大屏数据采集需求变更，接口修改

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

@@ -106,4 +106,14 @@ public class EventDataFormDTO implements Serializable {
      * 图片列表
      */
     private List<ImgDataListDTO> imgDataList;
+
+    /**
+     * 事件状态描述
+     */
+    private String eventStatusDesc;
+
+    /**
+     * 事件状态key
+     */
+    private String eventStatusCode;
 }

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

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 7、基层党建-建设情况数据（支部、联建） 入参
+ * 7、基层党建-建设情况数据（支部、联建、志愿） 入参
  * @Auther: zhangyong
  * @Date: 2020-08-18 09:59
  */
@@ -30,7 +30,7 @@ public class PartyBranchDataFormDTO implements Serializable {
     private String monthId;
 
     /**
-     * 数据类别 party:支部建设;union:联合建设
+     * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice
      */
     private String type;
 
@@ -55,14 +55,14 @@ public class PartyBranchDataFormDTO implements Serializable {
     private String orgName;
 
     /**
-     * 议题分类名称
+     * 会议分类名称
      */
-    private String issueCategoryName;
+    private String meetCategoryName;
 
     /**
-     * 议题分类id
+     * 会议分类id
      */
-    private String issueCategoryId;
+    private String meetCategoryId;
 
     /**
      * 组织次数
@@ -73,4 +73,9 @@ public class PartyBranchDataFormDTO implements Serializable {
      * 参加人数
      */
     private Integer joinUserCount;
+
+    /**
+     * 平均参加人数
+     */
+    private Integer averageJoinUserCount;
 }

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

@@ -3,7 +3,6 @@ package com.epmet.dto.screencoll.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * 11、基层治理-公众参与 入参
@@ -41,32 +40,27 @@ public class UserJoinFormDTO implements Serializable {
     private String orgName;
 
     /**
-     * 总的参与次数
+     * 组织次数
      */
-    private Integer joinTotal;
+    private Integer organizeTotal;
 
     /**
-     * 总的参与次数较上月增长率
+     * 参与次数
      */
-    private BigDecimal joinTotalUpRate;
-
-    /**
-     * 人均议题
-     */
-    private Integer avgIssue;
+    private Integer joinTotal;
 
     /**
-     * 人均议题较上月增长率
+     * 平均参与人数
      */
-    private BigDecimal avgIssueUpRate;
+    private Integer avgJoinUser;
 
     /**
-     * 平均参与度
+     * 年Id ：yyyy
      */
-    private Integer avgJoin;
+    private String yearId;
 
     /**
-     * 平均参与度较上月增长率
+     * 月份Id ：yyyyMM
      */
-    private BigDecimal avgJoinUpRate;
+    private String monthId;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java

@@ -1,5 +1,7 @@
 package com.epmet.controller;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
@@ -36,7 +38,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("partyuserrankdata")
-    public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam,@RequestBody List<PartyUserRankDataFormDTO> formDTO) {
+    public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PartyUserRankDataFormDTO> formDTO) {
         screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -55,15 +57,15 @@ public class ScreenCollController {
     }
 
     /**
-     * 7、基层党建-建设情况数据（支部、联建）
+     * 7、基层党建-建设情况数据（支部、联建、志愿）
      *
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    @PostMapping("partybranchdata")
-    public Result partyBranchData(@RequestBody List<PartyBranchDataFormDTO> formDTO) {
+    @PostMapping("meetdata")
+    public Result meetData(@RequestBody List<PartyBranchDataFormDTO> formDTO) {
         return screenCollService.insertPartyBranchData(formDTO);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java

@@ -34,7 +34,7 @@ import java.util.List;
 @Mapper
 public interface ScreenPartyBranchDataDao extends BaseDao<ScreenPartyBranchDataEntity> {
     /**
-     * 7、基层党建-建设情况数据（支部、联建）
+     * 7、基层党建-建设情况数据（支部、联建、志愿）
      *    1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
      *
      * @param customerId
@@ -50,7 +50,7 @@ public interface ScreenPartyBranchDataDao extends BaseDao<ScreenPartyBranchDataE
                                @Param("orgIds") String[] orgIds);
 
     /**
-     * 7、基层党建-建设情况数据（支部、联建）
+     * 7、基层党建-建设情况数据（支部、联建、志愿）
      *    2) 在批量新增
      *
      * @param list

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java

@@ -36,14 +36,18 @@ public interface ScreenUserJoinDao extends BaseDao<ScreenUserJoinEntity> {
 
     /**
      * 11、基层治理-公众参与
-     *    1)  根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
      *
      * @param customerId
+     * @param yearId
+     * @param monthId
      * @param orgIds  组织Id集合
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
     void deleteUserJoin(@Param("customerId") String customerId,
+                        @Param("yearId") String yearId,
+                        @Param("monthId") String monthId,
                         @Param("orgIds") String[] orgIds);
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java

@@ -32,7 +32,7 @@ public interface ScreenCollService {
     Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO);
 
     /**
-     * 7、基层党建-建设情况数据（支部、联建）
+     * 7、基层党建-建设情况数据（支部、联建、志愿）
      *    1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
      *    2) 在新增
      *
@@ -165,7 +165,7 @@ public interface ScreenCollService {
 
     /**
      * 11、基层治理-公众参与
-     *    1)  根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
      *    2) 在新增
      *
      * @param formDTO

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java

@@ -300,6 +300,8 @@ public class ScreenCollServiceImpl implements ScreenCollService {
                 orgIds[i] = formDTO.get(i).getOrgId();
             }
             screenUserJoinDao.deleteUserJoin(formDTO.get(NumConstant.ZERO).getCustomerId(),
+                    formDTO.get(NumConstant.ZERO).getYearId(),
+                    formDTO.get(NumConstant.ZERO).getMonthId(),
                     orgIds);
 
             screenUserJoinDao.batchInsertUserJoin(formDTO);

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

@@ -34,7 +34,9 @@
         CREATED_BY,
         CREATED_TIME,
         UPDATED_BY,
-        UPDATED_TIME
+        UPDATED_TIME,
+        EVENT_STATUS_CODE,
+        EVENT_STATUS_DESC
         ) values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -61,7 +63,9 @@
             'APP_USER',
             now(),
             'APP_USER',
-            now()
+            now(),
+            #{item.eventStatusCode},
+            #{item.eventStatusDesc}
             )
         </foreach>
     </insert>

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

@@ -24,10 +24,11 @@
         ORG_ID,
         PARENT_ID,
         ORG_NAME,
-        ISSUE_CATEGORY_ID,
-        ISSUE_CATEGORY_NAME,
+        MEET_CATEGORY_ID,
+        MEET_CATEGORY_NAME,
         ORGANIZE_COUNT,
         JOIN_USER_COUNT,
+        AVERAGE_JOIN_USER_COUNT,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -46,10 +47,11 @@
             #{item.orgId},
             #{item.parentId},
             #{item.orgName},
-            #{item.issueCategoryId},
-            #{item.issueCategoryName},
+            #{item.meetCategoryId},
+            #{item.meetCategoryName},
             #{item.organizeCount},
             #{item.joinUserCount},
+            #{item.averageJoinUserCount},
             0,
             0,
             'APP_USER',

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

@@ -5,7 +5,7 @@
 
     <delete id="deleteUserJoin">
         delete from screen_user_join
-        where CUSTOMER_ID = #{customerId}
+        where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
         AND ORG_ID IN
         <foreach item="item" collection="orgIds" open="(" separator="," close=")">
             #{item}
@@ -17,16 +17,15 @@
         (
         ID,
         CUSTOMER_ID,
+        YEAR_ID,
+        MONTH_ID,
         ORG_TYPE,
         ORG_ID,
         PARENT_ID,
         ORG_NAME,
+        ORGANIZE_TOTAL,
         JOIN_TOTAL,
-        JOIN_TOTAL_UP_RATE,
-        AVG_ISSUE,
-        AVG_ISSUE_UP_RATE,
-        AVG_JOIN,
-        AGVG_JOIN_UP_RATE,
+        AVG_JOIN_USER,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -38,16 +37,15 @@
             (
             (SELECT REPLACE(UUID(), '-', '') AS id),
             #{item.customerId},
+            #{item.yearId},
+            #{item.monthId},
             #{item.orgType},
             #{item.orgId},
             #{item.parentId},
             #{item.orgName},
+            #{item.organizeTotal},
             #{item.joinTotal},
-            #{item.joinTotalUpRate},
-            #{item.avgIssue},
-            #{item.avgIssueUpRate},
-            #{item.avgJoin},
-            #{item.avgJoinUpRate},
+            #{item.avgJoinUser},
             0,
             0,
             'APP_USER',