指数采集接口修改-end

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

@@ -55,15 +55,10 @@ public class GridGovrnAbilityFormDTO implements Serializable {
      */
     private Integer projectTotal;
 
-    /**
-     * 网格自治项目数
-     */
-    private Integer selfSolveProjectRatio;
-
     /**
      * 网格办结项目数
      */
-    private Integer resolveProjectTotal;
+    private Integer resolveProjectCount;
 
     /**
      * 网格吹哨部门准确率
@@ -79,4 +74,9 @@ public class GridGovrnAbilityFormDTO implements Serializable {
      * 网格议题转项目率
      */
     private BigDecimal avgShiftProjectRatio;
+
+    /**
+     * 网格自治项目数 统计期网格自身内办结的项目数目
+     */
+    private Integer selfSolveProjectCount;
 }

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

@@ -86,4 +86,13 @@ public class GridPartyMemberDataFormDTO implements Serializable {
      */
     private Integer issueToProjectCount;
 
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 上级组织Id
+     */
+    private String parentId;
 }

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

@@ -43,7 +43,7 @@ public class OrgServiceAbilityFormDTO implements Serializable {
     /**
      * allRegion：全区；community：社区；street：街道
      */
-    private Integer dataType;
+    private String dataType;
 
     /**
      * 社区/街道活动组织次数 爱心活动

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

@@ -36,12 +36,22 @@ public interface FactIndexGovrnAblityDeptMonthlyDao extends BaseDao<FactIndexGov
      * 8、治理能力-部门相关指标
      *    据CUSTOMER_ID、AGENCY_ID、DEPT_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
      *
-     * @param formDTO
+     * @param customerId
+     * @param agencyId
+     * @param deptId
+     * @param yearId
+     * @param monthId
+     * @param quarterId
      * @param customerId
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void deleteFactIndexGovrnAblityDeptMonthly(DeptGovrnAbilityFormDTO formDTO, @Param("customerId") String customerId);
+    void deleteFactIndexGovrnAblityDeptMonthly(@Param("customerId") String customerId,
+                                               @Param("agencyId") String agencyId,
+                                               @Param("deptId") String deptId,
+                                               @Param("yearId") String yearId,
+                                               @Param("monthId") String monthId,
+                                               @Param("quarterId") String quarterId);
 
     /**
      * 8、治理能力-部门相关指标

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

@@ -38,12 +38,21 @@ public interface FactIndexGovrnAblityGridMonthlyDao extends BaseDao<FactIndexGov
      * 6、治理能力-网格相关指标
      *    根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
      *
-     * @param formDTO
      * @param customerId
+     * @param agencyId
+     * @param gridId
+     * @param yearId
+     * @param monthId
+     * @param quarterId
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void deleteFactIndexGovrnAblityGridMonthly(GridGovrnAbilityFormDTO formDTO, @Param("customerId") String customerId);
+    void deleteFactIndexGovrnAblityGridMonthly(@Param("customerId") String customerId,
+                                               @Param("agencyId") String agencyId,
+                                               @Param("gridId") String gridId,
+                                               @Param("yearId") String yearId,
+                                               @Param("monthId") String monthId,
+                                               @Param("quarterId") String quarterId);
 
     /**
      * 6、治理能力-网格相关指标

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

@@ -38,12 +38,23 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
      * 1、党建能力-党员相关指标上报(按照月份)
      *    1) 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、USER_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
      *
-     * @param formDTO
      * @param customerId
+     * @param agencyId
+     * @param gridId
+     * @param userId
+     * @param yearId
+     * @param monthId
+     * @param quarterId
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void deleteFactIndexPartyAblityCpcMonthly(GridPartyMemberDataFormDTO formDTO, @Param("customerId") String customerId);
+    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);
 
     /**
      * 1、党建能力-党员相关指标上报(按照月份)
@@ -54,5 +65,6 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void batchInsertFactIndexPartyAblityCpcMonthly(@Param("list") List<GridPartyMemberDataFormDTO> list, @Param("customerId")String customerId);
+    void batchInsertFactIndexPartyAblityCpcMonthly(@Param("list") List<GridPartyMemberDataFormDTO> list,
+                                                   @Param("customerId")String customerId);
 }

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

@@ -38,12 +38,21 @@ public interface FactIndexPartyAblityGridMonthlyDao extends BaseDao<FactIndexPar
      * 2、党建能力-网格相关指标上报(按照月份)
      *    1) 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
      *
-     * @param formDTO
      * @param customerId
+     * @param agencyId
+     * @param gridId
+     * @param yearId
+     * @param monthId
+     * @param quarterId
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void deleteFactIndexPartyAblityGridMonthly(GridPartyAbilityFormDTO formDTO, @Param("customerId") String customerId);
+    void deleteFactIndexPartyAblityGridMonthly(@Param("customerId") String customerId,
+                                               @Param("agencyId") String agencyId,
+                                               @Param("gridId") String gridId,
+                                               @Param("yearId") String yearId,
+                                               @Param("monthId") String monthId,
+                                               @Param("quarterId") String quarterId);
 
     /**
      * 2、党建能力-网格相关指标上报(按照月份)

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

@@ -37,12 +37,21 @@ public interface FactIndexServiceAblityGridMonthlyDao extends BaseDao<FactIndexS
      * 4、服务能力-网格相关指标
      *   根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
      *
-     * @param formDTO
      * @param customerId
+     * @param agencyId
+     * @param gridId
+     * @param yearId
+     * @param monthId
+     * @param quarterId
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void deleteFactIndexServiceAblityGridMonthly(GridServiceAbilityFormDTO formDTO, @Param("customerId") String customerId);
+    void deleteFactIndexServiceAblityGridMonthly(@Param("customerId") String customerId,
+                                                 @Param("agencyId") String agencyId,
+                                                 @Param("gridId") String gridId,
+                                                 @Param("yearId") String yearId,
+                                                 @Param("monthId") String monthId,
+                                                 @Param("quarterId") String quarterId);
 
     /**
      * 4、服务能力-网格相关指标

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java

@@ -72,7 +72,7 @@ public class FactIndexGovrnAblityOrgMonthlyEntity extends BaseEpmetEntity {
     /**
      * 数据类型 allRegion：全区；street：街道；community：社区；grid：网格
      */
-	private Integer dataType;
+	private String dataType;
 
     /**
      * 被吹哨次数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexPartyAblityOrgMonthlyEntity.java

@@ -76,6 +76,6 @@ public class FactIndexPartyAblityOrgMonthlyEntity extends BaseEpmetEntity {
     /**
      * 数据类型 allRegion：全区；community：社区；street：街道
      */
-	private Integer dataType;
+	private String dataType;
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexServiceAblityOrgMonthlyEntity.java

@@ -76,6 +76,6 @@ public class FactIndexServiceAblityOrgMonthlyEntity extends BaseEpmetEntity {
     /**
      * 数据类型 allRegion：全区；street：街道；community：社区；grid：网格
      */
-	private Integer dataType;
+	private String dataType;
 
 }

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

@@ -39,7 +39,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     public void insertGridPartyMemberData(List<GridPartyMemberDataFormDTO> formDTO, String customerId) {
         if (null != formDTO && formDTO.size() > NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                factIndexPartyAblityCpcMonthlyDao.deleteFactIndexPartyAblityCpcMonthly(formDTO.get(i), customerId);
+                factIndexPartyAblityCpcMonthlyDao.deleteFactIndexPartyAblityCpcMonthly(customerId,
+                        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);
         }
@@ -50,7 +52,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     public void insertGridPartyAbility(List<GridPartyAbilityFormDTO> formDTO, String customerId) {
         if (null != formDTO && formDTO.size() > NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                factIndexPartyAblityGridMonthlyDao.deleteFactIndexPartyAblityGridMonthly(formDTO.get(i), customerId);
+                factIndexPartyAblityGridMonthlyDao.deleteFactIndexPartyAblityGridMonthly(customerId,
+                        formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(), formDTO.get(i).getYearId(),
+                        formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId());
             }
             factIndexPartyAblityGridMonthlyDao.batchInsertFactIndexPartyAblityGridMonthly(formDTO, customerId);
         }
@@ -78,7 +82,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     public void insertGridServiceAbility(List<GridServiceAbilityFormDTO> formDTO, String customerId) {
         if (null != formDTO && formDTO.size() > NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                factIndexServiceAblityGridMonthlyDao.deleteFactIndexServiceAblityGridMonthly(formDTO.get(i), customerId);
+                factIndexServiceAblityGridMonthlyDao.deleteFactIndexServiceAblityGridMonthly(customerId,
+                        formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(), formDTO.get(i).getYearId(),
+                        formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId());
             }
             factIndexServiceAblityGridMonthlyDao.batchInsertFactIndexServiceAblityGridMonthly(formDTO, customerId);
         }
@@ -106,7 +112,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     public void insertGridGovrnAbility(List<GridGovrnAbilityFormDTO> formDTO, String customerId) {
         if (null != formDTO && formDTO.size() > NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                factIndexGovrnAblityGridMonthlyDao.deleteFactIndexGovrnAblityGridMonthly(formDTO.get(i), customerId);
+                factIndexGovrnAblityGridMonthlyDao.deleteFactIndexGovrnAblityGridMonthly(customerId,
+                        formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(), formDTO.get(i).getYearId(),
+                        formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId());
             }
             factIndexGovrnAblityGridMonthlyDao.batchInsertFactIndexGovrnAblityGridMonthly(formDTO, customerId);
         }
@@ -134,7 +142,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     public void insertDeptGovrnAbility(List<DeptGovrnAbilityFormDTO> formDTO, String customerId) {
         if (null != formDTO && formDTO.size() > NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                factIndexGovrnAblityDeptMonthlyDao.deleteFactIndexGovrnAblityDeptMonthly(formDTO.get(i), customerId);
+                factIndexGovrnAblityDeptMonthlyDao.deleteFactIndexGovrnAblityDeptMonthly(customerId,
+                        formDTO.get(i).getAgencyId(), formDTO.get(i).getDeptId(), formDTO.get(i).getYearId(),
+                        formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId());
             }
             factIndexGovrnAblityDeptMonthlyDao.batchInsertFactIndexGovrnAblityDeptMonthly(formDTO, customerId);
         }

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.3__update_col_data_type.sql

@@ -0,0 +1,3 @@
+alter table fact_index_party_ablity_org_monthly MODIFY column DATA_TYPE VARCHAR(100) DEFAULT '' COMMENT '数据类型 allRegion：全区；community：社区；street：街道';
+alter table fact_index_service_ablity_org_monthly MODIFY column DATA_TYPE VARCHAR(100) DEFAULT '' COMMENT '数据类型 allRegion：全区；community：社区；street：街道';
+alter table fact_index_govrn_ablity_org_monthly MODIFY column DATA_TYPE VARCHAR(100) DEFAULT '' COMMENT '数据类型 allRegion：全区；community：社区；street：街道';

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

@@ -29,7 +29,7 @@
 
     <delete id="deleteFactIndexGovrnAblityGridMonthly">
         delete from fact_index_govrn_ablity_grid_monthly
-        where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId} AND USER_ID = #{userId}
+        where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId}
         AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId}
     </delete>