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

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

@@ -0,0 +1,30 @@
+package com.epmet.dto.indexcollect.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 8、治理能力-部门相关指标 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class DeptGovrnAbilityDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<DeptGovrnAbilityFormDTO> dataList;
+}

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

@@ -0,0 +1,30 @@
+package com.epmet.dto.indexcollect.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 6、治理能力-网格相关指标 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class GridGovrnAbilityDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<GridGovrnAbilityFormDTO> dataList;
+}

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

@@ -0,0 +1,30 @@
+package com.epmet.dto.indexcollect.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 2、党建能力-网格相关指标上报(按照月份) 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class GridPartyAbilityDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<GridPartyAbilityFormDTO> dataList;
+}

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

@@ -29,5 +29,5 @@ public class GridPartyMemberDataFormDTO implements Serializable {
      */
     private String monthId;
 
-    private List<GridPartyMemberDataDetailFormDTO>  partyMemberDataList;
+    private List<GridPartyMemberDataDetailFormDTO> dataList;
 }

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

@@ -0,0 +1,28 @@
+package com.epmet.dto.indexcollect.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 4、服务能力-网格相关指标 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class GridServiceAbilityDataFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<GridServiceAbilityFormDTO> dataList;
+}

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

@@ -0,0 +1,30 @@
+package com.epmet.dto.indexcollect.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 7、治理能力-街道及社区相关指标 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class OrgGovrnAbilityDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<OrgGovrnAbilityFormDTO> dataList;
+}

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

@@ -0,0 +1,30 @@
+package com.epmet.dto.indexcollect.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 3、党建能力-街道及社区相关指标 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class OrgPartyAbilityDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<OrgPartyAbilityFormDTO> dataList;
+
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.indexcollect.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 5、服务能力-组织（街道|社区|全区）相关指标 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class OrgServiceAbilityDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<OrgServiceAbilityFormDTO> dataList;
+}

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 2、党员基本情况 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class CpcBaseDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+
+    private List<CpcBaseDataFormDTO> dataList;
+}

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 14、组织层级 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class CustomerAgencyListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+
+    private List<CustomerAgencyFormDTO> dataList;
+}

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

@@ -0,0 +1,24 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 16、部门信息上传 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class CustomerDeptListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    private List<CustomerDeptFormDTO> dataList;
+}

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

@@ -0,0 +1,24 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 15、网格信息上传 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class CustomerGridListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    private List<CustomerGridFormDTO> dataList;
+}

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

@@ -21,6 +21,6 @@ public class DifficultyDataFormDTO implements Serializable {
     /**
      * 难点堵点数据
      */
-    private List<DifficultyDataDetailFormDTO> diffcultyDataList;
+    private List<DifficultyDataDetailFormDTO> dataList;
 
 }

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

@@ -0,0 +1,28 @@
+package com.epmet.dto.screencoll.form;
+
+import com.epmet.dto.indexcollect.form.GridPartyAbilityFormDTO;
+import com.epmet.dto.screencoll.ImgDataListDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 4、事件数据(中央区-事件数据) 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class EventDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    private List<EventDataFormDTO> dataList;
+
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 5、基层治理-治理能力数据 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class GovernRankDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<GovernRankDataFormDTO> dataList;
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 1、指数_按月统计 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class IndexDataListMonthlyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<IndexDataMonthlyFormDTO> dataList;
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 17、指数_按年统计 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class IndexDataListYearlyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyy
+     */
+    private String yearId;
+
+    private List<IndexDataYearlyFormDTO> dataList;
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 6、党建引领-组织排行 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class OrgRankDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<OrgRankDataFormDTO> dataList;
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 7、基层党建-建设情况数据（支部、联建、志愿） 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class PartyBranchDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<PartyBranchDataFormDTO> dataList;
+}

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

@@ -0,0 +1,24 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 8、党建引领-党员联系群众数据 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class PartyLinkMassesDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    private List<PartyLinkMassesDataFormDTO> dataList;
+}

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

@@ -0,0 +1,24 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 9、党建引领|基层治理-居民（党员）积分排行榜 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-21 09:59
+ */
+@Data
+public class PartyUserRankDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    private List<PartyUserRankDataFormDTO> dataList;
+}

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 10、党建引领-先锋模范数据
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class PioneerDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    private List<PioneerDataFormDTO> dataList;
+}

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 18、公众参与各类总数 入参
+ * 公众参与-各类(用户|党员|党群|话题|议题|项目|注册人数|参与人数)总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class PublicPartiTotalDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    private List<PublicPartiTotalDataFormDTO> dataList;
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 11、基层治理-公众参与 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class UserJoinListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    private List<UserJoinFormDTO> dataList;
+}

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

@@ -0,0 +1,24 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 12、中央区各类总数 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class UserTotalDataListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    private List<UserTotalDataFormDTO> dataList;
+}

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

@@ -4,12 +4,12 @@ import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.indexcollect.form.*;
-import com.epmet.dto.screencoll.form.IndexDataMonthlyFormDTO;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexCollectService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 指标采集相关api
@@ -51,7 +51,7 @@ public class FactIndexCollectController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("gridpartyability")
-    public Result gridPartyAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<GridPartyAbilityFormDTO> formDTO) {
+    public Result gridPartyAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody GridPartyAbilityDataFormDTO formDTO) {
         factIndexCollectService.insertGridPartyAbility(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -67,7 +67,7 @@ public class FactIndexCollectController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("orgpartyability")
-    public Result orgPartyAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<OrgPartyAbilityFormDTO> formDTO) {
+    public Result orgPartyAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody OrgPartyAbilityDataFormDTO formDTO) {
         factIndexCollectService.insertOrgPartyAbility(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -83,7 +83,7 @@ public class FactIndexCollectController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("gridserviceability")
-    public Result gridServiceAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<GridServiceAbilityFormDTO> formDTO) {
+    public Result gridServiceAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody GridServiceAbilityDataFormDTO formDTO) {
         factIndexCollectService.insertGridServiceAbility(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -99,7 +99,7 @@ public class FactIndexCollectController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("orgserviceability")
-    public Result orgServiceAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<OrgServiceAbilityFormDTO> formDTO) {
+    public Result orgServiceAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody OrgServiceAbilityDataFormDTO formDTO) {
         factIndexCollectService.insertOrgServiceAbility(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -115,7 +115,7 @@ public class FactIndexCollectController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("gridgovrnability")
-    public Result gridGovrnAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<GridGovrnAbilityFormDTO> formDTO) {
+    public Result gridGovrnAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody GridGovrnAbilityDataFormDTO formDTO) {
         factIndexCollectService.insertGridGovrnAbility(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -131,7 +131,7 @@ public class FactIndexCollectController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("orggovrnability")
-    public Result orgGovrnAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<OrgGovrnAbilityFormDTO> formDTO) {
+    public Result orgGovrnAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody OrgGovrnAbilityDataFormDTO formDTO) {
         factIndexCollectService.insertOrgGovrnAbility(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -147,7 +147,7 @@ public class FactIndexCollectController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("deptgovrnability")
-    public Result deptGovrnAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<DeptGovrnAbilityFormDTO> formDTO) {
+    public Result deptGovrnAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody DeptGovrnAbilityDataFormDTO formDTO) {
         factIndexCollectService.insertDeptGovrnAbility(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }

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

@@ -37,7 +37,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("partyuserrankdata")
-    public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PartyUserRankDataFormDTO> formDTO) {
+    public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PartyUserRankDataListFormDTO formDTO) {
         screenCollService.insertPartyUserRankData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -53,7 +53,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("partylinkmassesdata")
-    public Result partyLinkMassesData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PartyLinkMassesDataFormDTO> formDTO) {
+    public Result partyLinkMassesData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PartyLinkMassesDataListFormDTO formDTO) {
         screenCollService.insertPartyLinkMassesData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -69,7 +69,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("meetdata")
-    public Result meetData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PartyBranchDataFormDTO> formDTO) {
+    public Result meetData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PartyBranchDataListFormDTO formDTO) {
         screenCollService.insertPartyBranchData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -85,7 +85,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("orgrankdata")
-    public Result orgRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<OrgRankDataFormDTO> formDTO) {
+    public Result orgRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody OrgRankDataListFormDTO formDTO) {
         screenCollService.insertOrgRankData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -101,7 +101,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("governrankdata")
-    public Result governRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<GovernRankDataFormDTO> formDTO) {
+    public Result governRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody GovernRankDataListFormDTO formDTO) {
         screenCollService.insertGovernRankData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -117,7 +117,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("eventdata")
-    public Result eventData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<EventDataFormDTO> formDTO) {
+    public Result eventData(ExternalAppRequestParam externalAppRequestParam, @RequestBody EventDataListFormDTO formDTO) {
         screenCollService.insertEventData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -149,7 +149,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("cpcbasedata")
-    public Result cpcbaseData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CpcBaseDataFormDTO> formDTO) {
+    public Result cpcbaseData(ExternalAppRequestParam externalAppRequestParam, @RequestBody CpcBaseDataListFormDTO formDTO) {
         screenCollService.insertCpcbaseData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -165,7 +165,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("indexdatamonthly")
-    public Result indexDataMonthly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<IndexDataMonthlyFormDTO> formDTO) {
+    public Result indexDataMonthly(ExternalAppRequestParam externalAppRequestParam, @RequestBody IndexDataListMonthlyFormDTO formDTO) {
         screenCollService.insertIndexDataMonthly(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -183,7 +183,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("indexdatayearly")
-    public Result indexDataYearly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<IndexDataYearlyFormDTO> formDTO) {
+    public Result indexDataYearly(ExternalAppRequestParam externalAppRequestParam, @RequestBody IndexDataListYearlyFormDTO formDTO) {
         screenCollService.insertIndexDataYearly(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -199,7 +199,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("customerdept")
-    public Result customerDept(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CustomerDeptFormDTO> formDTO) {
+    public Result customerDept(ExternalAppRequestParam externalAppRequestParam, @RequestBody CustomerDeptListFormDTO formDTO) {
         screenCollService.insertCustomerDept(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -215,7 +215,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("customergrid")
-    public Result customerGrid(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CustomerGridFormDTO> formDTO) {
+    public Result customerGrid(ExternalAppRequestParam externalAppRequestParam, @RequestBody CustomerGridListFormDTO formDTO) {
         screenCollService.insertCustomerGrid(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -231,7 +231,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("customeragency")
-    public Result customerAgency(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CustomerAgencyFormDTO> formDTO) {
+    public Result customerAgency(ExternalAppRequestParam externalAppRequestParam, @RequestBody CustomerAgencyListFormDTO formDTO) {
         screenCollService.insertCustomerAgency(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -247,7 +247,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("usertotaldata")
-    public Result userTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<UserTotalDataFormDTO> formDTO) {
+    public Result userTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody UserTotalDataListFormDTO formDTO) {
         screenCollService.insertUserTotalData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -263,7 +263,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("userjoin")
-    public Result userJoin(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<UserJoinFormDTO> formDTO) {
+    public Result userJoin(ExternalAppRequestParam externalAppRequestParam, @RequestBody UserJoinListFormDTO formDTO) {
         screenCollService.insertUserJoin(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -279,7 +279,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("pioneerdata")
-    public Result pioneerData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PioneerDataFormDTO> formDTO) {
+    public Result pioneerData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PioneerDataListFormDTO formDTO) {
         screenCollService.insertPioneerData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
@@ -296,7 +296,7 @@ public class ScreenCollController {
      **/
     @ExternalAppRequestAuth
     @PostMapping("publicpartitotaldata")
-    public Result publicPartiTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PublicPartiTotalDataFormDTO> formDTO) {
+    public Result publicPartiTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PublicPartiTotalDataListFormDTO formDTO) {
         screenCollService.insertPublicPartiTotalData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }

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

@@ -37,24 +37,16 @@ import java.util.Map;
 public interface FactIndexGovrnAblityDeptMonthlyDao extends BaseDao<FactIndexGovrnAblityDeptMonthlyEntity> {
     /**
      * 8、治理能力-部门相关指标
-     *    据CUSTOMER_ID、AGENCY_ID、DEPT_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param agencyId
-     * @param deptId
-     * @param yearId
      * @param monthId
-     * @param quarterId
-     * @param customerId
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    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);
+    Integer deleteFactIndexGovrnAblityDeptMonthly(@Param("customerId") String customerId,
+                                               @Param("monthId") String monthId);
 
     /**
      * 8、治理能力-部门相关指标

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

@@ -47,15 +47,12 @@ public interface FactIndexGovrnAblityGridMonthlyDao extends BaseDao<FactIndexGov
      * @param yearId
      * @param monthId
      * @param quarterId
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    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);
+    Integer deleteFactIndexGovrnAblityGridMonthly(@Param("customerId") String customerId,
+                                               @Param("monthId") String monthId);
 
     /**
      * 6、治理能力-网格相关指标
@@ -92,7 +89,7 @@ public interface FactIndexGovrnAblityGridMonthlyDao extends BaseDao<FactIndexGov
      * @param formDTO
      * @author yinzuomei
      * @description 查询（治理能力-网格相关事实表）当前月共上传了多少条记录
-     * @Date 2020/8/31 14:31 
+     * @Date 2020/8/31 14:31
      **/
     int selectCount(CalculateCommonFormDTO formDTO);
 

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

@@ -36,21 +36,16 @@ import java.util.Map;
 public interface FactIndexGovrnAblityOrgMonthlyDao extends BaseDao<FactIndexGovrnAblityOrgMonthlyEntity> {
     /**
      * 7、治理能力-街道及社区相关指标
-     *   据CUSTOMER_ID、AGENCY_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *   根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param yearId
      * @param monthId
-     * @param quarterId
-     * @param agencyIds
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void deleteFactIndexGovrnAblityOrgMonthly(@Param("customerId") String customerId,
-                                              @Param("yearId") String yearId,
-                                              @Param("monthId") String monthId,
-                                              @Param("quarterId") String quarterId,
-                                              @Param("agencyIds") String[] agencyIds);
+    Integer deleteFactIndexGovrnAblityOrgMonthly(@Param("customerId") String customerId,
+                                              @Param("monthId") String monthId);
 
     /**
      * 7、治理能力-街道及社区相关指标

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

@@ -39,23 +39,16 @@ public interface FactIndexPartyAblityGridMonthlyDao extends BaseDao<FactIndexPar
 
     /**
      * 2、党建能力-网格相关指标上报(按照月份)
-     *    1) 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param agencyId
-     * @param gridId
-     * @param yearId
      * @param monthId
-     * @param quarterId
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    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);
+    Integer deleteFactIndexPartyAblityGridMonthly(@Param("customerId") String customerId,
+                                               @Param("monthId") String monthId);
 
     /**
      * 2、党建能力-网格相关指标上报(按照月份)

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

@@ -38,21 +38,16 @@ public interface FactIndexPartyAblityOrgMonthlyDao extends BaseDao<FactIndexPart
 
     /**
      * 3、党建能力-街道及社区相关指标
-     *    根据CUSTOMER_ID、AGENCY_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param yearId
      * @param monthId
-     * @param quarterId
-     * @param agencyIds
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void deleteFactIndexPartyAblityOrgMonthly(@Param("customerId") String customerId,
-                                              @Param("yearId") String yearId,
-                                              @Param("monthId") String monthId,
-                                              @Param("quarterId") String quarterId,
-                                              @Param("agencyIds") String[] agencyIds);
+    Integer deleteFactIndexPartyAblityOrgMonthly(@Param("customerId") String customerId,
+                                              @Param("monthId") String monthId);
 
     /**
      * 3、党建能力-街道及社区相关指标

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

@@ -38,23 +38,16 @@ import java.util.Map;
 public interface FactIndexServiceAblityGridMonthlyDao extends BaseDao<FactIndexServiceAblityGridMonthlyEntity> {
     /**
      * 4、服务能力-网格相关指标
-     *   根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *   根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param agencyId
-     * @param gridId
-     * @param yearId
      * @param monthId
-     * @param quarterId
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    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);
+    Integer deleteFactIndexServiceAblityGridMonthly(@Param("customerId") String customerId,
+                                                 @Param("monthId") String monthId);
 
     /**
      * 4、服务能力-网格相关指标
@@ -91,7 +84,7 @@ public interface FactIndexServiceAblityGridMonthlyDao extends BaseDao<FactIndexS
      * @param formDTO
      * @author yinzuomei
      * @description 查询（服务能力-网格相关事实表）共上传记录数
-     * @Date 2020/9/2 14:28 
+     * @Date 2020/9/2 14:28
      **/
     int selectCount(CalculateCommonFormDTO formDTO);
 

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

@@ -38,21 +38,16 @@ public interface FactIndexServiceAblityOrgMonthlyDao extends BaseDao<FactIndexSe
 
     /**
      * 5、服务能力-组织（街道|社区|全区）相关指标
-     *    根据CUSTOMER_ID、AGENCY_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param yearId
      * @param monthId
-     * @param quarterId
-     * @param agencyIds
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void deleteFactIndexServiceAblityOrgMonthly(@Param("customerId") String customerId,
-                                              @Param("yearId") String yearId,
-                                              @Param("monthId") String monthId,
-                                              @Param("quarterId") String quarterId,
-                                              @Param("agencyIds") String[] agencyIds);
+    Integer deleteFactIndexServiceAblityOrgMonthly(@Param("customerId") String customerId,
+                                              @Param("monthId") String monthId);
 
     /**
      * 5、服务能力-组织（街道|社区|全区）相关指标

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

@@ -36,15 +36,14 @@ public interface ScreenCpcBaseDataDao extends BaseDao<ScreenCpcBaseDataEntity> {
 
     /**
      *  2、党员基本情况
-     *    1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteCpcBaseData(@Param("customerId") String customerId,
-                              @Param("orgIds") String[] orgIds);
+    Integer deleteCpcBaseData(@Param("customerId") String customerId);
 
     /**
      *  2、党员基本情况

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

@@ -35,15 +35,14 @@ import java.util.List;
 public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEntity> {
     /**
      *14、组织层级
-     *   1)  根据CUSTOMER_ID、AGENCY_ID进行查询，如果有数据，则先进行物理删除
+     *   1)  根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param agencyIds  组织id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteCustomerAgency(@Param("customerId") String customerId,
-                            @Param("agencyIds") String[] agencyIds);
+    Integer deleteCustomerAgency(@Param("customerId") String customerId);
 
     /**
      * 14、组织层级
@@ -75,4 +74,12 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      * @Date 16:57 2020-09-03
      **/
     List<ScreenCustomerAgencyEntity> selectListAgencyInfo(@Param("customerId")String customerId);
+
+    /**
+     * @Description  根据agencyId查询上级组织Id
+     * @param agencyId
+     * @author zxc
+     * @date 2020/9/8 3:36 下午
+     */
+    String selectPid(@Param("agencyId")String agencyId);
 }

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

@@ -36,15 +36,14 @@ public interface ScreenCustomerDeptDao extends BaseDao<ScreenCustomerDeptEntity>
 
     /**
      *16、部门信息上传
-     *   1)  根据CUSTOMER_ID、DEPT_ID进行查询，如果有数据，则先进行物理删除
+     *   1)  根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param deptIds  部门Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteCustomerDept(@Param("customerId") String customerId,
-                         @Param("deptIds") String[] deptIds);
+    Integer deleteCustomerDept(@Param("customerId") String customerId);
 
     /**
      * 16、部门信息上传

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

@@ -37,15 +37,14 @@ import java.util.List;
 public interface ScreenCustomerGridDao extends BaseDao<ScreenCustomerGridEntity> {
     /**
      *15、网格信息上传
-     *   1)  根据CUSTOMER_ID、GRID_ID进行查询，如果有数据，则先进行物理删除
+     *   1)  根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param gridIds  网格Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteCustomerGrid(@Param("customerId") String customerId,
-                            @Param("gridIds") String[] gridIds);
+    Integer deleteCustomerGrid(@Param("customerId") String customerId);
 
     /**
      * 15、网格信息上传

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

@@ -36,7 +36,7 @@ import java.util.List;
 public interface ScreenDifficultyDataDao extends BaseDao<ScreenDifficultyDataEntity> {
     /**
      * 3、难点赌点
-     *    1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除
 
      * @param customerId  一
      * @Author zhangyong

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

@@ -35,17 +35,14 @@ import java.util.List;
 public interface ScreenEventDataDao extends BaseDao<ScreenEventDataEntity> {
     /**
      * 4、事件数据
-     *    1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId  一
-     * @param eventId     多
-     * @param orgId       多
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteEventData(@Param("customerId")String customerId,
-                         @Param("eventId")String eventId,
-                         @Param("orgId")String orgId);
+    Integer deleteEventData(@Param("customerId")String customerId);
 
     /**
      * 4、事件数据

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

@@ -35,19 +35,16 @@ import java.util.List;
 public interface ScreenGovernRankDataDao extends BaseDao<ScreenGovernRankDataEntity> {
     /**
      * 5、基层治理-治理能力数据
-     *    1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param yearId
      * @param monthId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteGovernRankData(@Param("customerId") String customerId,
-                           @Param("yearId") String yearId,
-                           @Param("monthId") String monthId,
-                           @Param("orgIds") String[] orgIds);
+    Integer deleteGovernRankData(@Param("customerId") String customerId,
+                           @Param("monthId") String monthId);
 
     /**
      * 5、基层治理-治理能力数据

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

@@ -36,19 +36,16 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao<ScreenIndexDataMonthl
 
     /**
      *1、指数相关
-     *    1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param yearId
      * @param monthId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteIndexDataMonthly(@Param("customerId") String customerId,
-                           @Param("yearId") String yearId,
-                           @Param("monthId") String monthId,
-                           @Param("orgIds") String[] orgIds);
+    Integer deleteIndexDataMonthly(@Param("customerId") String customerId,
+                           @Param("monthId") String monthId);
 
     /**
      * 1、指数相关

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

@@ -36,17 +36,16 @@ public interface ScreenIndexDataYearlyDao extends BaseDao<ScreenIndexDataYearlyE
 
     /**
      * 17、指数_按年统计
-     *    1) 根据CUSTOMER_ID、YEAR_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、YEAR_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
      * @param yearId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteIndexDataYearly(@Param("customerId") String customerId,
-                                @Param("yearId") String yearId,
-                                @Param("orgIds") String[] orgIds);
+    Integer deleteIndexDataYearly(@Param("customerId") String customerId,
+                                @Param("yearId") String yearId);
 
     /**
      * 17、指数_按年统计

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

@@ -35,19 +35,16 @@ import java.util.List;
 public interface ScreenOrgRankDataDao extends BaseDao<ScreenOrgRankDataEntity> {
     /**
      * 6、党建引领-组织排行
-     *    1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param yearId
      * @param monthId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteOrgRankData(@Param("customerId") String customerId,
-                               @Param("yearId") String yearId,
-                               @Param("monthId") String monthId,
-                               @Param("orgIds") String[] orgIds);
+    Integer deleteOrgRankData(@Param("customerId") String customerId,
+                               @Param("monthId") String monthId);
 
     /**
      * 6、党建引领-组织排行

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

@@ -35,19 +35,16 @@ import java.util.List;
 public interface ScreenPartyBranchDataDao extends BaseDao<ScreenPartyBranchDataEntity> {
     /**
      * 7、基层党建-建设情况数据（支部、联建、志愿）
-     *    1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param yearId
      * @param monthId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deletePartyBranchData(@Param("customerId") String customerId,
-                               @Param("yearId") String yearId,
-                               @Param("monthId") String monthId,
-                               @Param("orgIds") String[] orgIds);
+    Integer deletePartyBranchData(@Param("customerId") String customerId,
+                                  @Param("monthId") String monthId);
 
     /**
      * 7、基层党建-建设情况数据（支部、联建、志愿）

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

@@ -36,15 +36,14 @@ public interface ScreenPartyLinkMassesDataDao extends BaseDao<ScreenPartyLinkMas
 
     /**
      * 8、党建引领-党员联系群众数据
-     *    1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param orgIds     组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deletePartyLinkMassesData(@Param("customerId") String customerId,
-                                   @Param("orgIds") String[] orgIds);
+    Integer deletePartyLinkMassesData(@Param("customerId") String customerId);
 
     /**
      * 8、党建引领-党员联系群众数据

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

@@ -36,17 +36,14 @@ public interface ScreenPartyUserRankDataDao extends BaseDao<ScreenPartyUserRankD
 
     /**
      * 9、党建引领|基层治理-居民（党员）积分排行榜
-     *    1) 根据CUSTOMER_ID、GRID_ID、USER_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param gridId
-     * @param userId
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deletePartyUserRankData(@Param("customerId") String customerId,
-                                 @Param("gridId") String gridId,
-                                 @Param("userId") String userId);
+    Integer deletePartyUserRankData(@Param("customerId") String customerId);
 
     /**
      * 9、党建引领|基层治理-居民（党员）积分排行榜

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

@@ -36,15 +36,14 @@ public interface ScreenPioneerDataDao extends BaseDao<ScreenPioneerDataEntity> {
 
     /**
      * 10、党建引领-先锋模范数据
-     *    1)  根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deletePioneerData(@Param("customerId") String customerId,
-                        @Param("orgIds") String[] orgIds);
+    Integer deletePioneerData(@Param("customerId") String customerId);
 
     /**
      * 10、党建引领-先锋模范数据

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

@@ -37,15 +37,14 @@ public interface ScreenPublicPartiTotalDataDao extends BaseDao<ScreenPublicParti
     /**
      * 18、公众参与各类总数
      *     公众参与-各类(用户|党员|党群|话题|议题|项目|注册人数|参与人数)总数
-     *     1)  根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *     1)  根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-25
      **/
-    void deletePublicPartiTotalData(@Param("customerId") String customerId,
-                           @Param("orgIds") String[] orgIds);
+    Integer deletePublicPartiTotalData(@Param("customerId") String customerId);
 
     /**
      * 18、公众参与各类总数

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

@@ -51,19 +51,16 @@ public interface ScreenUserJoinDao extends BaseDao<ScreenUserJoinEntity> {
 
     /**
      * 11、基层治理-公众参与
-     *    1)  根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param yearId
      * @param monthId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @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);
+    Integer deleteUserJoin(@Param("customerId") String customerId,
+                        @Param("monthId") String monthId);
 
     /**
      * 11、基层治理-公众参与

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

@@ -36,15 +36,14 @@ public interface ScreenUserTotalDataDao extends BaseDao<ScreenUserTotalDataEntit
 
     /**
      * 12、中央区各类总数
-     *    1)  根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param customerId
-     * @param orgIds  组织Id集合
+     * @return java.util.Integer
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void deleteUserTotalData(@Param("customerId") String customerId,
-                                     @Param("orgIds") String[] orgIds);
+    Integer deleteUserTotalData(@Param("customerId") String customerId);
 
     /**
      * 12、中央区各类总数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@@ -78,7 +78,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             return false;
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
-        Map<String,String> pid = new HashMap<>();
+        Map<String, String> pid = new HashMap<>();
         //下属所有网格的党建能力平均值
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.XIA_SHU_SUO_YOU_WGDDJNLPJZ.getCode().equals(detail.getIndexCode())) {
@@ -86,18 +86,18 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
                     log.error(IndexCalConstant.GRID_PARTY_AVG_NULL);
                     return;
-                }else if (subGridPartyAvgScore.size() == NumConstant.ONE){
-                    pid.put(subGridPartyAvgScore.get(NumConstant.ZERO).getAgencyId(),subGridPartyAvgScore.get(NumConstant.ZERO).getParentId());
-                    sizeOne(subGridPartyAvgScore.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),pid);
+                } else if (subGridPartyAvgScore.size() == NumConstant.ONE) {
+                    pid.put(subGridPartyAvgScore.get(NumConstant.ZERO).getAgencyId(), subGridPartyAvgScore.get(NumConstant.ZERO).getParentId());
+                    sizeOne(subGridPartyAvgScore.get(NumConstant.ZERO).getAgencyId(), customerId, monthId, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), pid);
                     return;
-                }else if (subGridPartyAvgScore.size() > NumConstant.ONE) {
+                } else if (subGridPartyAvgScore.size() > NumConstant.ONE) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     Integer indexEnd = NumConstant.TEN;
                     List<List<SubGridAvgResultDTO>> subPartyAvgList = ListUtils.partition(subGridPartyAvgScore, indexEnd);
-                    subPartyAvgList.forEach( party -> {
+                    subPartyAvgList.forEach(party -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
-                            pid.put(c.getAgencyId(),c.getParentId());
+                            pid.put(c.getAgencyId(), c.getParentId());
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
@@ -115,21 +115,21 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 }
                 String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                 if (StringUtils.isEmpty(fieldNameByIndexCode)) {
-                    log.error(String.format(IndexCalConstant.INDEX_CODE_NULL,detail.getIndexCode()));
+                    log.error(String.format(IndexCalConstant.INDEX_CODE_NULL, detail.getIndexCode()));
                     return;
-                }else if (publishArticleCountList.size() == NumConstant.ONE){
-                    pid.put(publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
-                    sizeOne(publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),customerId,monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),pid);
+                } else if (publishArticleCountList.size() == NumConstant.ONE) {
+                    pid.put(publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
+                    sizeOne(publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), customerId, monthId, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), pid);
                     return;
-                }else if (publishArticleCountList.size() > NumConstant.ONE) {
+                } else if (publishArticleCountList.size() > NumConstant.ONE) {
                     List<BigDecimal> decimalList = publishArticleCountList.stream().map(m -> new BigDecimal(m.get(fieldNameByIndexCode).toString())).collect(Collectors.toList());
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(decimalList);
                     List<List<Map<String, Object>>> publishArticleList = ListUtils.partition(publishArticleCountList, IndexCalConstant.PAGE_SIZE);
-                    publishArticleList.forEach( publish -> {
+                    publishArticleList.forEach(publish -> {
                         ScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         publish.forEach(c -> {
-                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(),c.get(IndexCalConstant.PARENT_ID).toString());
+                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(), c.get(IndexCalConstant.PARENT_ID).toString());
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
@@ -143,7 +143,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         log.info("communityPartyCalculate getScoreCountOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
         HashMap<String, BigDecimal> scoreCountOfSampleId = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
         log.info("communityPartyCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreCountOfSampleId));
-        List<FactIndexCommunityScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),pid);
+        List<FactIndexCommunityScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), pid);
         deleteAndInsert(customerId, monthId, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), result);
         return true;
     }
@@ -162,7 +162,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             return false;
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
-        Map<String,String> pid = new HashMap<>();
+        Map<String, String> pid = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SHE_QU_XIA_SHU_SYWGZLNLHZPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubGridAvgResultDTO> subGridGovernAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
@@ -171,8 +171,8 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     return;
                 }
                 if (subGridGovernAvg.size() == NumConstant.ONE) {
-                    pid.put(subGridGovernAvg.get(NumConstant.ZERO).getAgencyId(),subGridGovernAvg.get(NumConstant.ZERO).getParentId());
-                    sizeOne(subGridGovernAvg.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),pid);
+                    pid.put(subGridGovernAvg.get(NumConstant.ZERO).getAgencyId(), subGridGovernAvg.get(NumConstant.ZERO).getParentId());
+                    sizeOne(subGridGovernAvg.get(NumConstant.ZERO).getAgencyId(), customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), pid);
                     return;
                 } else if (subGridGovernAvg.size() > NumConstant.ONE) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridGovernAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
@@ -180,7 +180,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     governAvg.forEach(avg -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
-                            pid.put(c.getAgencyId(),c.getParentId());
+                            pid.put(c.getAgencyId(), c.getParentId());
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
@@ -196,8 +196,8 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     log.error(IndexCalConstant.COMMUNITY_GOVERN_ABILITY_NULL);
                     return;
                 }else if (communityGovernAbility.size() == NumConstant.ONE) {
-                    pid.put(communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
-                    sizeOne(communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),customerId,monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),pid);
+                    pid.put(communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
+                    sizeOne(communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), pid);
                     return;
                 } else if (communityGovernAbility.size() > NumConstant.ONE) {
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
@@ -212,7 +212,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                         ScoreCalculator<Integer> sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         governAbility.forEach(c -> {
-                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(),c.get(IndexCalConstant.PARENT_ID).toString());
+                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(), c.get(IndexCalConstant.PARENT_ID).toString());
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
@@ -226,7 +226,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         log.info("communityGovernAbilityCalculate getScoreCountOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
         HashMap<String, BigDecimal> scoreCountOfSampleId = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
         log.info("communityGovernAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreCountOfSampleId));
-        List<FactIndexCommunityScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),pid);
+        List<FactIndexCommunityScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), pid);
         deleteAndInsert(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), result);
         return true;
     }
@@ -245,14 +245,14 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             return false;
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
-        Map<String,String> pid = new HashMap<>();
+        Map<String, String> pid = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.SHE_QU_XIA_JI_SYWGFWNLDFPJZ.getCode().equals(indexCode)) {
                 List<SubGridAvgResultDTO> subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
                 if (subGridServiceAvg.size() == NumConstant.ONE) {
-                    pid.put(subGridServiceAvg.get(NumConstant.ZERO).getAgencyId(),subGridServiceAvg.get(NumConstant.ZERO).getParentId());
-                    sizeOne(subGridServiceAvg.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),pid);
+                    pid.put(subGridServiceAvg.get(NumConstant.ZERO).getAgencyId(), subGridServiceAvg.get(NumConstant.ZERO).getParentId());
+                    sizeOne(subGridServiceAvg.get(NumConstant.ZERO).getAgencyId(), customerId, monthId, IndexCodeEnum.FU_WU_NENG_LI.getCode(), pid);
                     return;
                 } else if (subGridServiceAvg.size() > NumConstant.ONE) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
@@ -261,7 +261,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                         BigDecimalScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         serviceAvg.forEach(c -> {
-                            pid.put(c.getAgencyId(),c.getParentId());
+                            pid.put(c.getAgencyId(), c.getParentId());
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
@@ -275,8 +275,8 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     log.error(IndexCalConstant.COMMUNITY_SERVICE_ABILITY_NULL);
                     return;
                 }else if (communityActivityCountList.size() == NumConstant.ONE) {
-                    pid.put(communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
-                    sizeOne(communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),customerId,monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),pid);
+                    pid.put(communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
+                    sizeOne(communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), customerId, monthId, IndexCodeEnum.FU_WU_NENG_LI.getCode(), pid);
                     return;
                 } else if (communityActivityCountList.size() > NumConstant.ONE) {
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
@@ -291,7 +291,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                         ScoreCalculator<Integer> sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         communityActivity.forEach(c -> {
-                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(),c.get(IndexCalConstant.PARENT_ID).toString());
+                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(), c.get(IndexCalConstant.PARENT_ID).toString());
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
@@ -305,7 +305,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         log.info("communityServiceAbilityCalculate getScoreCountOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
         HashMap<String, BigDecimal> scoreCountOfSampleId = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
         log.info("communityServiceAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreCountOfSampleId));
-        List<FactIndexCommunityScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(),pid);
+        List<FactIndexCommunityScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), pid);
         deleteAndInsert(customerId, monthId, IndexCodeEnum.FU_WU_NENG_LI.getCode(), result);
         return true;
     }
@@ -408,16 +408,16 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
     }
 
     /**
+     * @param scoreCountOfSampleId 指标计算结果
+     * @param customerId           客户ID
+     * @param monthId              月份ID
+     * @param isTotal              是否 总分【党建+治理+服务】
+     * @param indexCode            党建能力：dangjiannengli，治理能力：zhilinengli，服务能力：fuwunengli，xx相关：xx相关
      * @Description
-     * @param scoreCountOfSampleId	 指标计算结果
-     * @param customerId	 客户ID
-     * @param monthId	 月份ID
-     * @param isTotal	 是否 总分【党建+治理+服务】
-     * @param indexCode	 党建能力：dangjiannengli，治理能力：zhilinengli，服务能力：fuwunengli，xx相关：xx相关
      * @author zxc
      * @date 2020/9/2 2:37 下午
      */
-    public List<FactIndexCommunityScoreDTO> getResult(HashMap<String, BigDecimal> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode,Map<String,String> pid) {
+    public List<FactIndexCommunityScoreDTO> getResult(HashMap<String, BigDecimal> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode, Map<String, String> pid) {
         List<FactIndexCommunityScoreDTO> result = new ArrayList<>();
         scoreCountOfSampleId.forEach((k, v) -> {
             FactIndexCommunityScoreDTO score = new FactIndexCommunityScoreDTO();
@@ -429,8 +429,8 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             score.setIsTotal(isTotal);
             score.setIndexCode(indexCode);
             score.setScore(v);
-            pid.forEach((agency,parentAgency) -> {
-                if (k.equals(agency)){
+            pid.forEach((agency, parentAgency) -> {
+                if (k.equals(agency)) {
                     score.setParentAgencyId(parentAgency);
                 }
             });
@@ -440,17 +440,17 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
     }
 
     /**
-     * @Description  当查询结果为一条时，调用此方法
      * @param agencyId
      * @param customerId
      * @param monthId
+     * @Description 当查询结果为一条时，调用此方法
      * @author zxc
      * @date 2020/9/2 2:40 下午
      */
-    public void sizeOne(String agencyId,String customerId,String monthId,String indexCode,Map<String,String> pid){
+    public void sizeOne(String agencyId, String customerId, String monthId, String indexCode, Map<String, String> pid) {
         HashMap<String, BigDecimal> scoreCountOfSampleId = new HashMap<>();
-        scoreCountOfSampleId.put(agencyId,new BigDecimal(NumConstant.FIFTY));
-        List<FactIndexCommunityScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, indexCode,pid);
+        scoreCountOfSampleId.put(agencyId, new BigDecimal(NumConstant.FIFTY));
+        List<FactIndexCommunityScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, indexCode, pid);
         deleteAndInsert(customerId, monthId, indexCode, result);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java

@@ -10,6 +10,7 @@ import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.indexcal.AgencyScoreDao;
 import com.epmet.dao.evaluationindex.indexcal.DeptScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
+import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
 import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
@@ -55,6 +56,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
     private AgencyScoreDao agencyScoreDao;
     @Autowired
     private DeptScoreDao deptScoreDao;
+    @Autowired
+    private ScreenCustomerAgencyDao customerAgencyDao;
 
     /**
      * @Description  计算全区相关总分
@@ -99,7 +102,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             return false;
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
-        Map<String,String> pid = new HashMap<>();
+        Map<String, String> pid = new HashMap<>();
         //党建能力平均值
         indexDetailList.forEach(detail -> {
             if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
@@ -107,18 +110,14 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
                     log.error(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
                     return;
-                }else if (subGridPartyAvgScore.size() == NumConstant.ONE){
-                    pid.put(subGridPartyAvgScore.get(NumConstant.ZERO).getAgencyId(),subGridPartyAvgScore.get(NumConstant.ZERO).getParentId());
-                    sizeOne(subGridPartyAvgScore.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),pid);
-                    return;
-                }else if (subGridPartyAvgScore.size() > NumConstant.ONE) {
+                } else if (subGridPartyAvgScore.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> subPartyAvgList = ListUtils.partition(subGridPartyAvgScore, IndexCalConstant.PAGE_SIZE);
-                    subPartyAvgList.forEach( party -> {
+                    subPartyAvgList.forEach(party -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
-                            pid.put(c.getAgencyId(),c.getParentId());
-                            SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
+                            pid.put(c.getParentId(),customerAgencyDao.selectPid(c.getParentId()));
+                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
@@ -135,21 +134,21 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 }
                 String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                 if (StringUtils.isEmpty(fieldNameByIndexCode)) {
-                    log.error(String.format(IndexCalConstant.INDEX_CODE_NULL,detail.getIndexCode()));
+                    log.error(String.format(IndexCalConstant.INDEX_CODE_NULL, detail.getIndexCode()));
                     return;
-                }else if (publishArticleCountList.size() == NumConstant.ONE){
-                    pid.put(publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
-                    sizeOne(publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),customerId,monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),pid);
+                } else if (publishArticleCountList.size() == NumConstant.ONE) {
+                    pid.put(publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
+                    sizeOne(publishArticleCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), customerId, monthId, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), pid);
                     return;
-                }else if (publishArticleCountList.size() > NumConstant.ONE) {
+                } else if (publishArticleCountList.size() > NumConstant.ONE) {
                     List<BigDecimal> decimalList = publishArticleCountList.stream().map(m -> new BigDecimal(m.get(fieldNameByIndexCode).toString())).collect(Collectors.toList());
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(decimalList);
                     List<List<Map<String, Object>>> publishArticleList = ListUtils.partition(publishArticleCountList, IndexCalConstant.PAGE_SIZE);
-                    publishArticleList.forEach( publish -> {
+                    publishArticleList.forEach(publish -> {
                         ScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         publish.forEach(c -> {
-                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(),c.get(IndexCalConstant.PARENT_ID).toString());
+                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(), c.get(IndexCalConstant.PARENT_ID).toString());
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
@@ -180,22 +179,21 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             return false;
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
-        Map<String,String> pid = new HashMap<>();
+        Map<String, String> pid = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
-                if (districtGovernAvgList.size() == NumConstant.ONE) {
-                    pid.put(districtGovernAvgList.get(NumConstant.ZERO).getAgencyId(),districtGovernAvgList.get(NumConstant.ZERO).getParentId());
-                    sizeOne(districtGovernAvgList.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),pid);
+                if (CollectionUtils.isEmpty(districtGovernAvgList)) {
+                    log.error("查询所有街道治理能力平均值集合为空");
                     return;
-                } else if (districtGovernAvgList.size() > NumConstant.ONE) {
+                } else if (districtGovernAvgList.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(districtGovernAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> governAvg = ListUtils.partition(districtGovernAvgList, IndexCalConstant.PAGE_SIZE);
                     governAvg.forEach(avg -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
-                            pid.put(c.getAgencyId(),c.getParentId());
-                            SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
+                            pid.put(c.getParentId(),customerAgencyDao.selectPid(c.getParentId()));
+                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
@@ -205,17 +203,16 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 }
             } else if (IndexCodeEnum.SUO_YOU_ZHI_SHU_BMZLNLPJZ.getCode().equals(detail.getIndexCode())){
                 List<SubAgencyScoreAvgResultDTO> deptScoreAvgList = deptScoreDao.selectGovernDeptScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
-                if (deptScoreAvgList.size() == NumConstant.ONE) {
-                    pid.put(deptScoreAvgList.get(NumConstant.ZERO).getAgencyId(),deptScoreAvgList.get(NumConstant.ZERO).getParentId());
-                    sizeOne(deptScoreAvgList.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),pid);
+                if (CollectionUtils.isEmpty(deptScoreAvgList)) {
+                    log.error("查询所有直属部门治理能力平均值集合为空");
                     return;
-                } else if (deptScoreAvgList.size() > NumConstant.ONE) {
+                } else if (deptScoreAvgList.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(deptScoreAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> governAvg = ListUtils.partition(deptScoreAvgList, IndexCalConstant.PAGE_SIZE);
                     governAvg.forEach(avg -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
-                            pid.put(c.getAgencyId(),c.getParentId());
+                            pid.put(c.getParentId(),customerAgencyDao.selectPid(c.getParentId()));
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
@@ -249,24 +246,23 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             return false;
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
-        Map<String,String> pid = new HashMap<>();
+        Map<String, String> pid = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
                 List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
-                if (subStreetAvgList.size() == NumConstant.ONE) {
-                    pid.put(subStreetAvgList.get(NumConstant.ZERO).getAgencyId(),subStreetAvgList.get(NumConstant.ZERO).getParentId());
-                    sizeOne(subStreetAvgList.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),pid);
+                if (CollectionUtils.isEmpty(subStreetAvgList)) {
+                    log.error("查询区下属街道服务能力汇总平均值集合为空");
                     return;
-                } else if (subStreetAvgList.size() > NumConstant.ONE) {
+                } else if (subStreetAvgList.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subStreetAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> serviceAvgList = ListUtils.partition(subStreetAvgList, IndexCalConstant.PAGE_SIZE);
                     serviceAvgList.forEach(serviceAvg -> {
                         BigDecimalScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         serviceAvg.forEach(c -> {
-                            pid.put(c.getAgencyId(),c.getParentId());
-                            SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
+                            pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                             index1SampleValues.add(s);
                         });
                         IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
@@ -279,7 +275,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, BigDecimal> scoreCountOfSampleId = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(),pid);
+        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), pid);
         deleteAndInsert(customerId, monthId, IndexCodeEnum.FU_WU_NENG_LI.getCode(), result);
         return true;
     }
@@ -356,16 +352,16 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
     }
 
     /**
+     * @param scoreCountOfSampleId 指标计算结果
+     * @param customerId           客户ID
+     * @param monthId              月份ID
+     * @param isTotal              是否 总分【党建+治理+服务】
+     * @param indexCode            党建能力：dangjiannengli，治理能力：zhilinengli，服务能力：fuwunengli，xx相关：xx相关
      * @Description
-     * @param scoreCountOfSampleId	 指标计算结果
-     * @param customerId	 客户ID
-     * @param monthId	 月份ID
-     * @param isTotal	 是否 总分【党建+治理+服务】
-     * @param indexCode	 党建能力：dangjiannengli，治理能力：zhilinengli，服务能力：fuwunengli，xx相关：xx相关
      * @author zxc
      * @date 2020/9/2 2:37 下午
      */
-    public List<AgencyScoreDTO> getResult(HashMap<String, BigDecimal> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode,Map<String,String> pid) {
+    public List<AgencyScoreDTO> getResult(HashMap<String, BigDecimal> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode, Map<String, String> pid) {
         List<AgencyScoreDTO> result = new ArrayList<>();
         scoreCountOfSampleId.forEach((k, v) -> {
             AgencyScoreDTO score = new AgencyScoreDTO();
@@ -378,8 +374,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             score.setIndexCode(indexCode);
             score.setScore(v);
             score.setDataType(IndexCalConstant.DISTRICT_LEVEL);
-            pid.forEach((agency,parentAgency) -> {
-                if (k.equals(agency)){
+            pid.forEach((agency, parentAgency) -> {
+                if (k.equals(agency)) {
                     score.setParentAgencyId(parentAgency);
                 }
             });
@@ -389,17 +385,17 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
     }
 
     /**
-     * @Description  当查询结果为一条时，调用此方法
      * @param agencyId
      * @param customerId
      * @param monthId
+     * @Description 当查询结果为一条时，调用此方法
      * @author zxc
      * @date 2020/9/2 2:40 下午
      */
-    public void sizeOne(String agencyId,String customerId,String monthId,String indexCode,Map<String,String> pid){
+    public void sizeOne(String agencyId, String customerId, String monthId, String indexCode, Map<String, String> pid) {
         HashMap<String, BigDecimal> scoreCountOfSampleId = new HashMap<>();
-        scoreCountOfSampleId.put(agencyId,new BigDecimal(NumConstant.FIFTY));
-        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, indexCode,pid);
+        scoreCountOfSampleId.put(agencyId, new BigDecimal(NumConstant.FIFTY));
+        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, indexCode, pid);
         deleteAndInsert(customerId, monthId, indexCode, result);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

@@ -12,6 +12,7 @@ import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.screen.FactIndexCommunityScoreDao;
+import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
 import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.dto.indexcal.SubCommunityAvgResultDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
@@ -61,6 +62,8 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
     private FactIndexCommunityScoreDao communityScoreDao;
     @Autowired
     private AgencyScoreDao agencyScoreDao;
+    @Autowired
+    private ScreenCustomerAgencyDao customerAgencyDao;
 
     /**
      * @Description  计算街道相关总分
@@ -105,7 +108,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             return false;
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
-        Map<String,String> pid = new HashMap<>();
+        Map<String, String> pid = new HashMap<>();
         //下属所有社区的党建能力平均值
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
@@ -113,11 +116,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 if (CollectionUtils.isEmpty(subCommPartyAvgScore)) {
                     log.error(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL);
                     return;
-                }else if (subCommPartyAvgScore.size() == NumConstant.ONE){
-                    pid.put(subCommPartyAvgScore.get(NumConstant.ZERO).getAgencyId(),subCommPartyAvgScore.get(NumConstant.ZERO).getParentId());
-                    sizeOne(subCommPartyAvgScore.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),pid);
-                    return;
-                }else if (subCommPartyAvgScore.size() > NumConstant.ONE) {
+                } else if (subCommPartyAvgScore.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     Integer indexEnd = NumConstant.TEN;
                     List<List<SubCommunityAvgResultDTO>> partition = ListUtils.partition(subCommPartyAvgScore, indexEnd);
@@ -142,20 +141,20 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 }
                 String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                 if (StringUtils.isEmpty(fieldName)) {
-                    log.error(String.format(IndexCalConstant.INDEX_CODE_NULL,detail.getIndexCode()));
+                    log.error(String.format(IndexCalConstant.INDEX_CODE_NULL, detail.getIndexCode()));
                     return;
-                }else if (mapList.size() == NumConstant.ONE){
-                    pid.put(mapList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),mapList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
-                    sizeOne(mapList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),customerId,monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),pid);
+                } else if (mapList.size() == NumConstant.ONE) {
+                    pid.put(mapList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), mapList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
+                    sizeOne(mapList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), customerId, monthId, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), pid);
                     return;
-                }else if (mapList.size() > NumConstant.ONE) {
+                } else if (mapList.size() > NumConstant.ONE) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(mapList.stream().map(m -> new BigDecimal(m.get(fieldName).toString())).collect(Collectors.toList()));
                     List<List<Map<String, Object>>> publishArticleList = ListUtils.partition(mapList, IndexCalConstant.PAGE_SIZE);
                     publishArticleList.forEach(publish -> {
                         ScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         publish.forEach(c -> {
-                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(),c.get(IndexCalConstant.PARENT_ID).toString());
+                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(), c.get(IndexCalConstant.PARENT_ID).toString());
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldName))));
                             index1SampleValues.add(s);
                         });
@@ -167,7 +166,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, BigDecimal> scoreCountOfSampleId = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),pid);
+        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), pid);
         deleteAndInsert(customerId, monthId, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), result);
         return true;
     }
@@ -186,15 +185,14 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             return false;
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
-        Map<String,String> pid = new HashMap<>();
+        Map<String, String> pid = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQZLNLHZ.getCode().equals(detail.getIndexCode())) {
                 List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
-                if (subGridGovernAvg.size() == NumConstant.ONE) {
-                    pid.put(subGridGovernAvg.get(NumConstant.ZERO).getAgencyId(),subGridGovernAvg.get(NumConstant.ZERO).getParentId());
-                    sizeOne(subGridGovernAvg.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),pid);
+                if (CollectionUtils.isEmpty(subGridGovernAvg)){
+                    log.error("查询街道下属所有社区治理能力汇总为空");
                     return;
-                } else if (subGridGovernAvg.size() > NumConstant.ONE) {
+                }else if (subGridGovernAvg.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridGovernAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubCommunityAvgResultDTO>> governAvg = ListUtils.partition(subGridGovernAvg, IndexCalConstant.PAGE_SIZE);
                     governAvg.forEach(avg -> {
@@ -216,8 +214,8 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                     log.error(IndexCalConstant.STREET_GOVERN_ABILITY_NULL);
                     return;
                 }else if (communityGovernAbility.size() == NumConstant.ONE) {
-                    pid.put(communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
-                    sizeOne(communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),customerId,monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),pid);
+                    pid.put(communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
+                    sizeOne(communityGovernAbility.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), pid);
                     return;
                 } else if (communityGovernAbility.size() > NumConstant.ONE) {
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
@@ -230,10 +228,9 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                     List<List<Map<String, Object>>> governAbilityList = ListUtils.partition(communityGovernAbility, IndexCalConstant.PAGE_SIZE);
                     governAbilityList.forEach(governAbility -> {
                         ScoreCalculator<Integer> sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        System.err.println(detail.getCorrelation());
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         governAbility.forEach(c -> {
-                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(),c.get(IndexCalConstant.PARENT_ID).toString());
+                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(), c.get(IndexCalConstant.PARENT_ID).toString());
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
@@ -245,7 +242,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, BigDecimal> scoreCountOfSampleId = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),pid);
+        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), pid);
         deleteAndInsert(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), result);
         return true;
     }
@@ -264,16 +261,15 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             return false;
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
-        Map<String,String> pid = new HashMap<>();
+        Map<String, String> pid = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SQFWNLDFPYZ.getCode().equals(indexCode)) {
                 List<SubCommunityAvgResultDTO> subCommServiceAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
-                if (subCommServiceAvg.size() == NumConstant.ONE) {
-                    pid.put(subCommServiceAvg.get(NumConstant.ZERO).getAgencyId(),subCommServiceAvg.get(NumConstant.ZERO).getParentId());
-                    sizeOne(subCommServiceAvg.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),pid);
+                if (CollectionUtils.isEmpty(subCommServiceAvg)) {
+                    log.error("查询街道下属社区服务能力得分平均值为空");
                     return;
-                } else if (subCommServiceAvg.size() > NumConstant.ONE) {
+                } else if (subCommServiceAvg.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubCommunityAvgResultDTO>> serviceAvgList = ListUtils.partition(subCommServiceAvg, IndexCalConstant.PAGE_SIZE);
                     serviceAvgList.forEach(serviceAvg -> {
@@ -294,8 +290,8 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                     log.error(IndexCalConstant.STREET_SERVICE_ABILITY_NULL);
                     return;
                 }else if (communityActivityCountList.size() == NumConstant.ONE) {
-                    pid.put(communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
-                    sizeOne(communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(),customerId,monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),pid);
+                    pid.put(communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.PARENT_ID).toString());
+                    sizeOne(communityActivityCountList.get(NumConstant.ZERO).get(IndexCalConstant.AGENCY_ID).toString(), customerId, monthId, IndexCodeEnum.FU_WU_NENG_LI.getCode(), pid);
                     return;
                 } else if (communityActivityCountList.size() > NumConstant.ONE) {
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
@@ -310,7 +306,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                         ScoreCalculator<Integer> sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         communityActivity.forEach(c -> {
-                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(),c.get(IndexCalConstant.PARENT_ID).toString());
+                            pid.put(c.get(IndexCalConstant.AGENCY_ID).toString(), c.get(IndexCalConstant.PARENT_ID).toString());
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
@@ -322,7 +318,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, BigDecimal> scoreCountOfSampleId = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(),pid
+        List<AgencyScoreDTO> result = getResult(scoreCountOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), pid
         );
         deleteAndInsert(customerId, monthId, IndexCodeEnum.FU_WU_NENG_LI.getCode(), result);
         return true;
@@ -400,16 +396,16 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
     }
 
     /**
+     * @param scoreCountOfSampleId 指标计算结果
+     * @param customerId           客户ID
+     * @param monthId              月份ID
+     * @param isTotal              是否 总分【党建+治理+服务】
+     * @param indexCode            党建能力：dangjiannengli，治理能力：zhilinengli，服务能力：fuwunengli，xx相关：xx相关
      * @Description
-     * @param scoreCountOfSampleId	 指标计算结果
-     * @param customerId	 客户ID
-     * @param monthId	 月份ID
-     * @param isTotal	 是否 总分【党建+治理+服务】
-     * @param indexCode	 党建能力：dangjiannengli，治理能力：zhilinengli，服务能力：fuwunengli，xx相关：xx相关
      * @author zxc
      * @date 2020/9/2 2:37 下午
      */
-    public List<AgencyScoreDTO> getResult(HashMap<String, BigDecimal> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode,Map<String,String> pid) {
+    public List<AgencyScoreDTO> getResult(HashMap<String, BigDecimal> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode, Map<String, String> pid) {
         List<AgencyScoreDTO> result = new ArrayList<>();
         scoreCountOfSampleId.forEach((k, v) -> {
             AgencyScoreDTO score = new AgencyScoreDTO();
@@ -421,8 +417,8 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             score.setIsTotal(isTotal);
             score.setIndexCode(indexCode);
             score.setScore(v);
-            pid.forEach((agency,parentAgency) -> {
-                if (k.equals(agency)){
+            pid.forEach((agency, parentAgency) -> {
+                if (k.equals(agency)) {
                     score.setParentAgencyId(parentAgency);
                 }
             });
@@ -432,17 +428,17 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
     }
 
     /**
-     * @Description  当查询结果为一条时，调用此方法
      * @param agencyId
      * @param customerId
      * @param monthId
+     * @Description 当查询结果为一条时，调用此方法
      * @author zxc
      * @date 2020/9/2 2:40 下午
      */
-    public void sizeOne(String agencyId,String customerId,String monthId,String indexCode,Map<String,String> pid){
+    public void sizeOne(String agencyId, String customerId, String monthId, String indexCode, Map<String, String> pid) {
         HashMap<String, BigDecimal> scoreCountOfSample = new HashMap<>();
-        scoreCountOfSample.put(agencyId,new BigDecimal(NumConstant.FIFTY));
-        List<AgencyScoreDTO> result = getResult(scoreCountOfSample, customerId, monthId, NumConstant.ZERO_STR, indexCode,pid);
+        scoreCountOfSample.put(agencyId, new BigDecimal(NumConstant.FIFTY));
+        List<AgencyScoreDTO> result = getResult(scoreCountOfSample, customerId, monthId, NumConstant.ZERO_STR, indexCode, pid);
         deleteAndInsert(customerId, monthId, indexCode, result);
     }
 }

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

@@ -26,7 +26,7 @@ public interface FactIndexCollectService {
 
     /**
      *  2、党建能力-网格相关指标上报(按照月份)
-     *    根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param formDTO
      * @param customerId
@@ -34,11 +34,11 @@ public interface FactIndexCollectService {
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void insertGridPartyAbility(List<GridPartyAbilityFormDTO> formDTO, String customerId);
+    void insertGridPartyAbility(GridPartyAbilityDataFormDTO formDTO, String customerId);
 
     /**
      * 3、党建能力-街道及社区相关指标
-     *    根据CUSTOMER_ID、AGENCY_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param formDTO
      * @param customerId
@@ -46,11 +46,11 @@ public interface FactIndexCollectService {
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void insertOrgPartyAbility(List<OrgPartyAbilityFormDTO> formDTO, String customerId);
+    void insertOrgPartyAbility(OrgPartyAbilityDataFormDTO formDTO, String customerId);
 
     /**
      * 4、服务能力-网格相关指标
-     *    据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param formDTO
      * @param customerId
@@ -58,11 +58,11 @@ public interface FactIndexCollectService {
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void insertGridServiceAbility(List<GridServiceAbilityFormDTO> formDTO, String customerId);
+    void insertGridServiceAbility(GridServiceAbilityDataFormDTO formDTO, String customerId);
 
     /**
      * 5、服务能力-组织（街道|社区|全区）相关指标
-     *    据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
+     *    根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *
      * @param formDTO
      * @param customerId
@@ -70,7 +70,7 @@ public interface FactIndexCollectService {
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void insertOrgServiceAbility(List<OrgServiceAbilityFormDTO> formDTO, String customerId);
+    void insertOrgServiceAbility(OrgServiceAbilityDataFormDTO formDTO, String customerId);
 
     /**
      * 6、治理能力-网格相关指标
@@ -82,7 +82,7 @@ public interface FactIndexCollectService {
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void insertGridGovrnAbility(List<GridGovrnAbilityFormDTO> formDTO, String customerId);
+    void insertGridGovrnAbility(GridGovrnAbilityDataFormDTO formDTO, String customerId);
 
     /**
      * 7、治理能力-街道及社区相关指标
@@ -94,7 +94,7 @@ public interface FactIndexCollectService {
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void insertOrgGovrnAbility(List<OrgGovrnAbilityFormDTO> formDTO, String customerId);
+    void insertOrgGovrnAbility(OrgGovrnAbilityDataFormDTO formDTO, String customerId);
 
     /**
      * 8、治理能力-部门相关指标
@@ -106,7 +106,7 @@ public interface FactIndexCollectService {
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-    void insertDeptGovrnAbility(List<DeptGovrnAbilityFormDTO> formDTO, String customerId);
+    void insertDeptGovrnAbility(DeptGovrnAbilityDataFormDTO formDTO, String customerId);
 
     /**
      * 将网格、社区、区直部门、区/街道分支记录表中的数据，抽取到 指数-指数数据(每月数值)  指数-指数数据(按年统计)

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

@@ -1,7 +1,6 @@
 package com.epmet.service.evaluationindex.indexcoll.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -27,8 +26,6 @@ import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity;
 import com.epmet.eum.IndexCodeEnum;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexCollectService;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +45,6 @@ import java.util.stream.Collectors;
 @Service
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class FactIndexCollectServiceImpl implements FactIndexCollectService {
-    private static final Logger log = LoggerFactory.getLogger(FactIndexCollectServiceImpl.class);
 
     @Autowired
     private FactIndexPartyAblityCpcMonthlyDao factIndexPartyAblityCpcMonthlyDao;
@@ -96,118 +92,113 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                 deleteNum = factIndexPartyAblityCpcMonthlyDao.deleteFactIndexPartyAblityCpcMonthly(customerId, formDTO.getMonthId());
             } while (deleteNum != NumConstant.ZERO);
         }
-        if (null != formDTO && !CollectionUtils.isEmpty(formDTO.getPartyMemberDataList())) {
-            factIndexPartyAblityCpcMonthlyDao.batchInsertFactIndexPartyAblityCpcMonthly(formDTO.getPartyMemberDataList(), customerId);
+        if (null != formDTO && !CollectionUtils.isEmpty(formDTO.getDataList())) {
+            factIndexPartyAblityCpcMonthlyDao.batchInsertFactIndexPartyAblityCpcMonthly(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    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(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);
+    public void insertGridPartyAbility(GridPartyAbilityDataFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = factIndexPartyAblityGridMonthlyDao.deleteFactIndexPartyAblityGridMonthly(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if ( !CollectionUtils.isEmpty(formDTO.getDataList())) {
+            factIndexPartyAblityGridMonthlyDao.batchInsertFactIndexPartyAblityGridMonthly(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertOrgPartyAbility(List<OrgPartyAbilityFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] agencyIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                agencyIds[i] = formDTO.get(i).getAgencyId();
-            }
-            factIndexPartyAblityOrgMonthlyDao.deleteFactIndexPartyAblityOrgMonthly(customerId,
-                    formDTO.get(NumConstant.ZERO).getYearId(),
-                    formDTO.get(NumConstant.ZERO).getMonthId(),
-                    formDTO.get(NumConstant.ZERO).getQuarterId(),
-                    agencyIds);
-            factIndexPartyAblityOrgMonthlyDao.batchInsertFactIndexPartyAblityOrgMonthly(formDTO, customerId);
+    public void insertOrgPartyAbility(OrgPartyAbilityDataFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = factIndexPartyAblityOrgMonthlyDao.deleteFactIndexPartyAblityOrgMonthly(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            factIndexPartyAblityOrgMonthlyDao.batchInsertFactIndexPartyAblityOrgMonthly(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    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(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);
+    public void insertGridServiceAbility(GridServiceAbilityDataFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = factIndexServiceAblityGridMonthlyDao.deleteFactIndexServiceAblityGridMonthly(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            factIndexServiceAblityGridMonthlyDao.batchInsertFactIndexServiceAblityGridMonthly(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertOrgServiceAbility(List<OrgServiceAbilityFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] agencyIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                agencyIds[i] = formDTO.get(i).getAgencyId();
-            }
-            factIndexServiceAblityOrgMonthlyDao.deleteFactIndexServiceAblityOrgMonthly(customerId,
-                    formDTO.get(NumConstant.ZERO).getYearId(),
-                    formDTO.get(NumConstant.ZERO).getMonthId(),
-                    formDTO.get(NumConstant.ZERO).getQuarterId(),
-                    agencyIds);
-            factIndexServiceAblityOrgMonthlyDao.batchInsertFactIndexServiceAblityOrgMonthly(formDTO, customerId);
+    public void insertOrgServiceAbility(OrgServiceAbilityDataFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = factIndexServiceAblityOrgMonthlyDao.deleteFactIndexServiceAblityOrgMonthly(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            factIndexServiceAblityOrgMonthlyDao.batchInsertFactIndexServiceAblityOrgMonthly(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    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(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);
+    public void insertGridGovrnAbility(GridGovrnAbilityDataFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = factIndexGovrnAblityGridMonthlyDao.deleteFactIndexGovrnAblityGridMonthly(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            factIndexGovrnAblityGridMonthlyDao.batchInsertFactIndexGovrnAblityGridMonthly(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertOrgGovrnAbility(List<OrgGovrnAbilityFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] agencyIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                agencyIds[i] = formDTO.get(i).getAgencyId();
-            }
-            factIndexGovrnAblityOrgMonthlyDao.deleteFactIndexGovrnAblityOrgMonthly(customerId,
-                    formDTO.get(NumConstant.ZERO).getYearId(),
-                    formDTO.get(NumConstant.ZERO).getMonthId(),
-                    formDTO.get(NumConstant.ZERO).getQuarterId(),
-                    agencyIds);
-            factIndexGovrnAblityOrgMonthlyDao.batchInsertFactIndexGovrnAblityOrgMonthly(formDTO, customerId);
+    public void insertOrgGovrnAbility(OrgGovrnAbilityDataFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = factIndexGovrnAblityOrgMonthlyDao.deleteFactIndexGovrnAblityOrgMonthly(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            factIndexGovrnAblityOrgMonthlyDao.batchInsertFactIndexGovrnAblityOrgMonthly(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    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(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);
+    public void insertDeptGovrnAbility(DeptGovrnAbilityDataFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = factIndexGovrnAblityDeptMonthlyDao.deleteFactIndexGovrnAblityDeptMonthly(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            factIndexGovrnAblityDeptMonthlyDao.batchInsertFactIndexGovrnAblityDeptMonthly(formDTO.getDataList(), customerId);
         }
     }
 
@@ -283,13 +274,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         Map<String, List<FactIndexGridScoreDTO>> collect = gridScoreDTOS.stream().collect(Collectors.groupingBy(FactIndexGridScoreDTO::getGridId));
         // 查询网格的 上级组织id 和 组织名称
         List<ScreenCustomerGridDTO> parentGridList = screenCustomerGridDao.selectListGridInfo(customerId);
-        String[] orgIds = new String[collect.size()];
-        int j = 0;
         for(Map.Entry<String,List<FactIndexGridScoreDTO>> gridScore : collect.entrySet()){
             IndexDataMonthlyFormDTO monthlyFormDTO = new IndexDataMonthlyFormDTO();
-            // 网格id
-            orgIds[j] = gridScore.getKey();
-            j++;
+
             // 给4个指数 赋默认值
             monthlyFormDTO = this.setIndexDefaultValueFor(monthlyFormDTO);
             for ( int i = 0; i < gridScore.getValue().size(); i++){
@@ -324,7 +311,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             monthlyFormDTOList.add(monthlyFormDTO);
         }
         if (monthlyFormDTOList.size() > NumConstant.ZERO){
-            screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, getYearStr(monthId), monthId, orgIds);
+            screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, monthId);
             screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(monthlyFormDTOList, customerId);
         }
     }
@@ -382,13 +369,8 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         Map<String, List<FactIndexCommunityScoreDTO>> collect = communityScoreDTOS.stream().collect(Collectors.groupingBy(FactIndexCommunityScoreDTO::getAgencyId));
         // 根据客户id，查询区/街道  组织名称、id
         List<ScreenCustomerAgencyEntity> parentAgencyList = screenCustomerAgencyDao.selectListAgencyInfo(customerId);
-        String[] orgIds = new String[collect.size()];
-        int j = 0;
         for(Map.Entry<String,List<FactIndexCommunityScoreDTO>> communityScore : collect.entrySet()){
             IndexDataMonthlyFormDTO monthlyFormDTO = new IndexDataMonthlyFormDTO();
-            // 组织id
-            orgIds[j] = communityScore.getKey();
-            j++;
             // 给4个指数 赋默认值
             monthlyFormDTO = this.setIndexDefaultValueFor(monthlyFormDTO);
             for ( int i = 0; i < communityScore.getValue().size(); i++){
@@ -425,7 +407,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             monthlyFormDTOList.add(monthlyFormDTO);
         }
         if (monthlyFormDTOList.size() > NumConstant.ZERO){
-            screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, getYearStr(monthId), monthId, orgIds);
+            screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, monthId);
             screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(monthlyFormDTOList, customerId);
         }
     }
@@ -478,13 +460,8 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         // 根据部门id 进行分组，最后组装一条数据   一个部门id 对应 4条数据
         Map<String, List<DeptScoreDTO>> collect = deptScoreDTOS.stream().collect(Collectors.groupingBy(DeptScoreDTO::getDeptId));
         List<ScreenCustomerDeptEntity> parentDeptList = screenCustomerDeptDao.selectListDeptInfo(customerId);
-        String[] orgIds = new String[collect.size()];
-        int j = 0;
         for(Map.Entry<String,List<DeptScoreDTO>> deptScore : collect.entrySet()){
             IndexDataMonthlyFormDTO monthlyFormDTO = new IndexDataMonthlyFormDTO();
-            // 部门id
-            orgIds[j] = deptScore.getKey();
-            j++;
             // 给4个指数 赋默认值
             monthlyFormDTO = this.setIndexDefaultValueFor(monthlyFormDTO);
             for ( int i = 0; i < deptScore.getValue().size(); i++){
@@ -513,7 +490,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             monthlyFormDTOList.add(monthlyFormDTO);
         }
         if (monthlyFormDTOList.size() > NumConstant.ZERO){
-            screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, getYearStr(monthId), monthId, orgIds);
+            screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, monthId);
             screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(monthlyFormDTOList, customerId);
         }
     }
@@ -564,13 +541,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         // 根据组织id(eg：社区或者街道id) 进行分组，最后组装一条数据   一个组织id 对应 4条数据
         Map<String, List<AgencyScoreDTO>> collect = agencyScoreDTOS.stream().collect(Collectors.groupingBy(AgencyScoreDTO::getAgencyId));
         List<ScreenCustomerAgencyEntity> parentAgencyList = screenCustomerAgencyDao.selectListAgencyInfo(customerId);
-        String[] orgIds = new String[collect.size()];
         int j = 0;
         for(Map.Entry<String,List<AgencyScoreDTO>> agencyScore : collect.entrySet()){
             IndexDataMonthlyFormDTO monthlyFormDTO = new IndexDataMonthlyFormDTO();
-            // 组织id(eg：社区或者街道id)
-            orgIds[j] = agencyScore.getKey();
-            j++;
             // 给4个指数 赋默认值
             monthlyFormDTO = this.setIndexDefaultValueFor(monthlyFormDTO);
             for ( int i = 0; i < agencyScore.getValue().size(); i++){
@@ -602,7 +575,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             monthlyFormDTOList.add(monthlyFormDTO);
         }
         if (monthlyFormDTOList.size() > NumConstant.ZERO){
-            screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, getYearStr(monthId), monthId, orgIds);
+            screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, monthId);
             screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(monthlyFormDTOList, customerId);
         }
     }
@@ -872,12 +845,8 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
      **/
     private void insertIndexDataYear(String monthId, String customerId){
         List<IndexDataMonthlyFormDTO> monthlyFormList = screenIndexDataMonthlyDao.selectListIndexDataMonthlyByYear(customerId, getYearStr(monthId), getMonthStr(monthId));
-        String[] orgIds = new String[monthlyFormList.size()];
-        for (int i = NumConstant.ZERO; i < monthlyFormList.size(); i++){
-            orgIds[i] = monthlyFormList.get(i).getOrgId();
-        }
         if (monthlyFormList.size() > NumConstant.ZERO){
-            screenIndexDataYearlyDao.deleteIndexDataYearly(customerId, getYearStr(monthId), orgIds);
+            screenIndexDataYearlyDao.deleteIndexDataYearly(customerId, getYearStr(monthId));
             List<IndexDataYearlyFormDTO> entity = ConvertUtils.sourceToTarget(monthlyFormList, IndexDataYearlyFormDTO.class);
             screenIndexDataYearlyDao.batchInsertIndexDataYearly(entity, customerId);
         }

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

@@ -13,7 +13,7 @@ public interface ScreenCollService {
 
     /**
      * 9、党建引领|基层治理-居民（党员）积分排行榜
-     *    1) 根据CUSTOMER_ID、GRID_ID、USER_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -22,11 +22,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO, String customerId);
+    void insertPartyUserRankData(PartyUserRankDataListFormDTO formDTO, String customerId);
 
     /**
      * 8、党建引领-党员联系群众数据
-     *    1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -35,11 +35,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO, String customerId);
+    void insertPartyLinkMassesData(PartyLinkMassesDataListFormDTO formDTO, String customerId);
 
     /**
      * 7、基层党建-建设情况数据（支部、联建、志愿）
-     *    1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -48,11 +48,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO, String customerId);
+    void insertPartyBranchData(PartyBranchDataListFormDTO formDTO, String customerId);
 
     /**
      * 6、党建引领-组织排行
-     *    1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -61,11 +61,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertOrgRankData(List<OrgRankDataFormDTO> formDTO, String customerId);
+    void insertOrgRankData(OrgRankDataListFormDTO formDTO, String customerId);
 
     /**
      * 5、基层治理-治理能力数据
-     *    1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -74,11 +74,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertGovernRankData(List<GovernRankDataFormDTO> formDTO, String customerId);
+    void insertGovernRankData(GovernRankDataListFormDTO formDTO, String customerId);
 
     /**
      * 4、事件数据
-     *    1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -87,11 +87,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertEventData(List<EventDataFormDTO> formDTO, String customerId);
+    void insertEventData(EventDataListFormDTO formDTO, String customerId);
 
     /**
      * 3、难点赌点
-     *    1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除
      *    2) 在新增
      *
      * @param formDTO
@@ -104,7 +104,7 @@ public interface ScreenCollService {
 
     /**
      * 2、党员基本情况
-     *    1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -113,11 +113,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO, String customerId);
+    void insertCpcbaseData(CpcBaseDataListFormDTO formDTO, String customerId);
 
     /**
      * 1、指数_按月统计
-     *    1)  根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -126,11 +126,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> formDTO, String customerId);
+    void insertIndexDataMonthly(IndexDataListMonthlyFormDTO formDTO, String customerId);
 
     /**
      * 17、指数_按年统计
-     *    1)  根据CUSTOMER_ID、YEAR_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID、YEAR_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -139,11 +139,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertIndexDataYearly(List<IndexDataYearlyFormDTO> formDTO, String customerId);
+    void insertIndexDataYearly(IndexDataListYearlyFormDTO formDTO, String customerId);
 
     /**
      * 16、部门信息上传
-     *    1)  根据CUSTOMER_ID、DEPT_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -152,11 +152,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertCustomerDept(List<CustomerDeptFormDTO> formDTO, String customerId);
+    void insertCustomerDept(CustomerDeptListFormDTO formDTO, String customerId);
 
     /**
      * 15、网格信息上传
-     *    1)  根据CUSTOMER_ID、GRID_ID进行查询，如果有数据，则先进行物理删除
+     *    1) 根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -165,11 +165,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertCustomerGrid(List<CustomerGridFormDTO> formDTO, String customerId);
+    void insertCustomerGrid(CustomerGridListFormDTO formDTO, String customerId);
 
     /**
      * 14、组织层级
-     *    1)  根据CUSTOMER_ID、AGENCY_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -178,7 +178,7 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO, String customerId);
+    void insertCustomerAgency(CustomerAgencyListFormDTO formDTO, String customerId);
 
     /**
      * 12、中央区各类总数
@@ -191,11 +191,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertUserTotalData(List<UserTotalDataFormDTO> formDTO, String customerId);
+    void insertUserTotalData(UserTotalDataListFormDTO formDTO, String customerId);
 
     /**
      * 11、基层治理-公众参与
-     *    1)  根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID、MONTH_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -204,11 +204,11 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertUserJoin(List<UserJoinFormDTO> formDTO, String customerId);
+    void insertUserJoin(UserJoinListFormDTO formDTO, String customerId);
 
     /**
      * 10、党建引领-先锋模范数据
-     *    1)  根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *    1)  根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *    2) 在新增
      *
      * @param formDTO
@@ -217,12 +217,12 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void insertPioneerData(List<PioneerDataFormDTO> formDTO, String customerId);
+    void insertPioneerData(PioneerDataListFormDTO formDTO, String customerId);
 
     /**
      * 18、公众参与各类总数
      * 公众参与-各类(用户|党员|党群|话题|议题|项目|注册人数|参与人数)总数
-     *   1)  根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除
+     *   1) 根据CUSTOMER_ID进行查询，如果有数据，则先进行物理删除, 一次删除1000条
      *   2) 在新增
      * @param formDTO
      * @param formDTO
@@ -230,5 +230,5 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 09:44 2020-08-25
      **/
-    void insertPublicPartiTotalData(List<PublicPartiTotalDataFormDTO> formDTO, String customerId);
+    void insertPublicPartiTotalData(PublicPartiTotalDataListFormDTO formDTO, String customerId);
 }

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

@@ -87,110 +87,104 @@ public class ScreenCollServiceImpl implements ScreenCollService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO,String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                screenPartyUserRankDataDao.deletePartyUserRankData(customerId,
-                        formDTO.get(NumConstant.ZERO).getGridId(),
-                        formDTO.get(NumConstant.ZERO).getUserId());
-            }
-
-            screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO,customerId);
+    public void insertPartyUserRankData(PartyUserRankDataListFormDTO formDTO,String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenPartyUserRankDataDao.deletePartyUserRankData(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenPartyLinkMassesDataDao.deletePartyLinkMassesData(customerId, orgIds);
-
-            screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO, customerId);
+    public void insertPartyLinkMassesData(PartyLinkMassesDataListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenPartyLinkMassesDataDao.deletePartyLinkMassesData(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenPartyBranchDataDao.deletePartyBranchData(customerId,
-                    formDTO.get(NumConstant.ZERO).getYearId(),
-                    formDTO.get(NumConstant.ZERO).getMonthId(),
-                    orgIds);
-
-            screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO, customerId);
+    public void insertPartyBranchData(PartyBranchDataListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenPartyBranchDataDao.deletePartyBranchData(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertOrgRankData(List<OrgRankDataFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenOrgRankDataDao.deleteOrgRankData(customerId,
-                    formDTO.get(NumConstant.ZERO).getYearId(),
-                    formDTO.get(NumConstant.ZERO).getMonthId(),
-                    orgIds);
-
-            screenOrgRankDataDao.batchInsertOrgRankData(formDTO, customerId);
+    public void insertOrgRankData(OrgRankDataListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenOrgRankDataDao.deleteOrgRankData(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenOrgRankDataDao.batchInsertOrgRankData(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertGovernRankData(List<GovernRankDataFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenGovernRankDataDao.deleteGovernRankData(customerId,
-                    formDTO.get(NumConstant.ZERO).getYearId(),
-                    formDTO.get(NumConstant.ZERO).getMonthId(),
-                    orgIds);
-
-            screenGovernRankDataDao.batchInsertGovernRankData(formDTO, customerId);
+    public void insertGovernRankData(GovernRankDataListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenGovernRankDataDao.deleteGovernRankData(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenGovernRankDataDao.batchInsertGovernRankData(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertEventData(List<EventDataFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                screenEventDataDao.deleteEventData(customerId, formDTO.get(i).getEventId(), formDTO.get(i).getOrgId());
-            }
-
-            screenEventDataDao.batchInsertEventData(formDTO, customerId);
+    public void insertEventData(EventDataListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenEventDataDao.deleteEventData(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenEventDataDao.batchInsertEventData(formDTO.getDataList(), customerId);
+        }
 
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++) {
-                if (null != formDTO.get(i).getImgDataList() && formDTO.get(i).getImgDataList().size() > NumConstant.ZERO) {
-                    // 根据原始事件ID，物理删除 - 事件数据图片数据
-                    screenEventImgDataDao.delEventImgDataByEventId(formDTO.get(i).getEventId());
-                    for (int j = NumConstant.ZERO; j < formDTO.get(i).getImgDataList().size(); j++){
-                        // 新增 中央区-事件数据图片数据 表
-                        ScreenEventImgDataEntity imgDataEntity = new ScreenEventImgDataEntity();
-                        imgDataEntity.setEventId(formDTO.get(i).getImgDataList().get(j).getEventId());
-                        imgDataEntity.setEventImgUrl(formDTO.get(i).getImgDataList().get(j).getImgUrl());
-                        imgDataEntity.setSort(formDTO.get(i).getImgDataList().get(j).getSort());
-                        screenEventImgDataDao.insert(imgDataEntity);
-                    }
+        // 处理图片
+        for (int i = NumConstant.ZERO; i < formDTO.getDataList().size(); i++) {
+            if (null != formDTO.getDataList().get(i).getImgDataList() && formDTO.getDataList().get(i).getImgDataList().size() > NumConstant.ZERO) {
+                // 根据原始事件ID，物理删除 - 事件数据图片数据
+                screenEventImgDataDao.delEventImgDataByEventId(formDTO.getDataList().get(i).getEventId());
+                for (int j = NumConstant.ZERO; j < formDTO.getDataList().get(i).getImgDataList().size(); j++){
+                    // 新增 中央区-事件数据图片数据 表
+                    ScreenEventImgDataEntity imgDataEntity = new ScreenEventImgDataEntity();
+                    imgDataEntity.setEventId(formDTO.getDataList().get(i).getImgDataList().get(j).getEventId());
+                    imgDataEntity.setEventImgUrl(formDTO.getDataList().get(i).getImgDataList().get(j).getImgUrl());
+                    imgDataEntity.setSort(formDTO.getDataList().get(i).getImgDataList().get(j).getSort());
+                    screenEventImgDataDao.insert(imgDataEntity);
                 }
             }
         }
@@ -204,178 +198,177 @@ public class ScreenCollServiceImpl implements ScreenCollService {
             //直接删除当前客户下所有的数据
             screenDifficultyDataDao.deleteDifficultyData(customerId);
         }
-        if (null != formDTO && !CollectionUtils.isEmpty(formDTO.getDiffcultyDataList())){
-            screenDifficultyDataDao.batchInsertDifficultyData(formDTO.getDiffcultyDataList(), customerId);
+        if (null != formDTO && !CollectionUtils.isEmpty(formDTO.getDataList())){
+            screenDifficultyDataDao.batchInsertDifficultyData(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenCpcBaseDataDao.deleteCpcBaseData(customerId, orgIds);
-
-            screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO, customerId);
+    public void insertCpcbaseData(CpcBaseDataListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenCpcBaseDataDao.deleteCpcBaseData(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId,
-                    formDTO.get(NumConstant.ZERO).getYearId(),
-                    formDTO.get(NumConstant.ZERO).getMonthId(),
-                    orgIds);
-
-            screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO, customerId);
+    public void insertIndexDataMonthly(IndexDataListMonthlyFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertIndexDataYearly(List<IndexDataYearlyFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenIndexDataYearlyDao.deleteIndexDataYearly(customerId,
-                    formDTO.get(NumConstant.ZERO).getYearId(),
-                    orgIds);
-
-            screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO, customerId);
+    public void insertIndexDataYearly(IndexDataListYearlyFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenIndexDataYearlyDao.deleteIndexDataYearly(customerId, formDTO.getYearId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertCustomerDept(List<CustomerDeptFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] deptIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                deptIds[i] = formDTO.get(i).getDeptId();
-            }
-            screenCustomerDeptDao.deleteCustomerDept(customerId, deptIds);
-
-            screenCustomerDeptDao.batchInsertCustomerDept(formDTO, customerId);
+    public void insertCustomerDept(CustomerDeptListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenCustomerDeptDao.deleteCustomerDept(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenCustomerDeptDao.batchInsertCustomerDept(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertCustomerGrid(List<CustomerGridFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] gridIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                gridIds[i] = formDTO.get(i).getGridId();
-            }
-            screenCustomerGridDao.deleteCustomerGrid(customerId,  gridIds);
-
-            screenCustomerGridDao.batchInsertCustomerGrid(formDTO, customerId);
+    public void insertCustomerGrid(CustomerGridListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenCustomerGridDao.deleteCustomerGrid(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenCustomerGridDao.batchInsertCustomerGrid(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] agencyIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                agencyIds[i] = formDTO.get(i).getAgencyId();
-            }
-            screenCustomerAgencyDao.deleteCustomerAgency(customerId, agencyIds);
-
-            screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO, customerId);
+    public void insertCustomerAgency(CustomerAgencyListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenCustomerAgencyDao.deleteCustomerAgency(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertUserTotalData(List<UserTotalDataFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenUserTotalDataDao.deleteUserTotalData(customerId, orgIds);
-
-            screenUserTotalDataDao.batchInsertUserTotalData(formDTO, customerId);
+    public void insertUserTotalData(UserTotalDataListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenUserTotalDataDao.deleteUserTotalData(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenUserTotalDataDao.batchInsertUserTotalData(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertUserJoin(List<UserJoinFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenUserJoinDao.deleteUserJoin(customerId,
-                    formDTO.get(NumConstant.ZERO).getYearId(),
-                    formDTO.get(NumConstant.ZERO).getMonthId(),
-                    orgIds);
-
-            String[] lastMonth = this.lastMonthDate();
-            // 获取上个月的基本数据
-            String moneth = lastMonth[NumConstant.ZERO] + lastMonth[NumConstant.ONE];
-            List<ScreenUserJoinEntity> lastMonthJoinList = screenUserJoinDao.selectLastMonthScreenUserJoinList(customerId,
-                    lastMonth[NumConstant.ZERO],
-                    moneth,
-                    orgIds);
+    public void insertUserJoin(UserJoinListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenUserJoinDao.deleteUserJoin(customerId, formDTO.getMonthId());
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            if (formDTO.getDataList().size() > NumConstant.ZERO){
+                String[] orgIds = new String[formDTO.getDataList().size()];
+                for (int i = NumConstant.ZERO; i < formDTO.getDataList().size(); i++){
+                    orgIds[i] = formDTO.getDataList().get(i).getOrgId();
+                }
 
-            // 定义本月待添加数据的集合
-            List<ScreenUserJoinEntity> curMonthJoinEntityList = new ArrayList<>();
-            // 增加率计算
-            if (null != lastMonthJoinList && lastMonthJoinList.size() > NumConstant.ZERO){
-                // 存在上个月的数据 （本月-上月）/上月  *100
-                for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                    for (int j = NumConstant.ZERO; j < lastMonthJoinList.size(); j++){
-                        if (formDTO.get(i).getOrgId().equals(lastMonthJoinList.get(j).getOrgId())){
-                            ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(formDTO.get(i), ScreenUserJoinEntity.class);
-                            entity.setJoinTotalUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getJoinTotal(), formDTO.get(j).getJoinTotal()));
-                            entity.setJoinTotalUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getJoinTotal(), formDTO.get(j).getJoinTotal()));
-                            entity.setAvgIssueUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getAvgIssue(), formDTO.get(j).getAvgIssue()));
-                            entity.setAvgIssueUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getAvgIssue(), formDTO.get(j).getAvgIssue()));
-                            entity.setAgvgJoinUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getAvgJoin(), formDTO.get(j).getAvgJoin()));
-                            entity.setAgvgJoinUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getAvgJoin(), formDTO.get(j).getAvgJoin()));
-                            curMonthJoinEntityList.add(entity);
+                String[] lastMonth = this.lastMonthDate();
+                // 获取上个月的基本数据
+                String moneth = lastMonth[NumConstant.ZERO] + lastMonth[NumConstant.ONE];
+                List<ScreenUserJoinEntity> lastMonthJoinList = screenUserJoinDao.selectLastMonthScreenUserJoinList(customerId,
+                        lastMonth[NumConstant.ZERO],
+                        moneth,
+                        orgIds);
+
+                // 定义本月待添加数据的集合
+                List<ScreenUserJoinEntity> curMonthJoinEntityList = new ArrayList<>();
+                // 增加率计算
+                if (null != lastMonthJoinList && lastMonthJoinList.size() > NumConstant.ZERO){
+                    // 存在上个月的数据 （本月-上月）/上月  *100
+                    for (int i = NumConstant.ZERO; i < formDTO.getDataList().size(); i++){
+                        for (int j = NumConstant.ZERO; j < lastMonthJoinList.size(); j++){
+                            if (formDTO.getDataList().get(i).getOrgId().equals(lastMonthJoinList.get(j).getOrgId())){
+                                ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(formDTO.getDataList().get(i), ScreenUserJoinEntity.class);
+                                entity.setJoinTotalUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getJoinTotal(), formDTO.getDataList().get(j).getJoinTotal()));
+                                entity.setJoinTotalUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getJoinTotal(), formDTO.getDataList().get(j).getJoinTotal()));
+                                entity.setAvgIssueUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getAvgIssue(), formDTO.getDataList().get(j).getAvgIssue()));
+                                entity.setAvgIssueUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getAvgIssue(), formDTO.getDataList().get(j).getAvgIssue()));
+                                entity.setAgvgJoinUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getAvgJoin(), formDTO.getDataList().get(j).getAvgJoin()));
+                                entity.setAgvgJoinUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getAvgJoin(), formDTO.getDataList().get(j).getAvgJoin()));
+                                curMonthJoinEntityList.add(entity);
+                            }
                         }
                     }
+                } else {
+                    // 计算增长率后的 待新增数据
+                    BigDecimal zero = new BigDecimal(NumConstant.ZERO);
+                    // 不存在上个月的数据
+                    for (int i = NumConstant.ZERO; i < formDTO.getDataList().size(); i++){
+                        ScreenUserJoinEntity entity =  ConvertUtils.sourceToTarget(formDTO.getDataList().get(i), ScreenUserJoinEntity.class);
+                        entity.setJoinTotalUpRate(zero);
+                        entity.setJoinTotalUpFlag("");
+                        entity.setAvgIssueUpRate(zero);
+                        entity.setAvgIssueUpFlag("");
+                        entity.setAgvgJoinUpRate(zero);
+                        entity.setAgvgJoinUpFlag("");
+                        curMonthJoinEntityList.add(entity);
+                    }
                 }
-            } else {
-                // 计算增长率后的 待新增数据
-                BigDecimal zero = new BigDecimal(NumConstant.ZERO);
-                // 不存在上个月的数据
-                for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                    ScreenUserJoinEntity entity =  ConvertUtils.sourceToTarget(formDTO.get(i), ScreenUserJoinEntity.class);
-                    entity.setJoinTotalUpRate(zero);
-                    entity.setJoinTotalUpFlag("");
-                    entity.setAvgIssueUpRate(zero);
-                    entity.setAvgIssueUpFlag("");
-                    entity.setAgvgJoinUpRate(zero);
-                    entity.setAgvgJoinUpFlag("");
-                    curMonthJoinEntityList.add(entity);
-                }
+                screenUserJoinDao.batchInsertUserJoin(curMonthJoinEntityList, customerId);
             }
-            screenUserJoinDao.batchInsertUserJoin(curMonthJoinEntityList, customerId);
         }
     }
 
@@ -441,30 +434,30 @@ public class ScreenCollServiceImpl implements ScreenCollService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertPioneerData(List<PioneerDataFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenPioneerDataDao.deletePioneerData(customerId, orgIds);
-
-            screenPioneerDataDao.batchInsertPioneerData(formDTO, customerId);
+    public void insertPioneerData(PioneerDataListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenPioneerDataDao.deletePioneerData(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenPioneerDataDao.batchInsertPioneerData(formDTO.getDataList(), customerId);
         }
     }
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertPublicPartiTotalData(List<PublicPartiTotalDataFormDTO> formDTO, String customerId) {
-        if (null != formDTO && formDTO.size() > NumConstant.ZERO){
-            String[] orgIds = new String[formDTO.size()];
-            for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
-                orgIds[i] = formDTO.get(i).getOrgId();
-            }
-            screenPublicPartiTotalDataDao.deletePublicPartiTotalData(customerId, orgIds);
-
-            screenPublicPartiTotalDataDao.batchInsertPublicPartiTotalData(formDTO, customerId);
+    public void insertPublicPartiTotalData(PublicPartiTotalDataListFormDTO formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenPublicPartiTotalDataDao.deletePublicPartiTotalData(customerId);
+            } while (deleteNum != NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenPublicPartiTotalDataDao.batchInsertPublicPartiTotalData(formDTO.getDataList(), customerId);
         }
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java

@@ -4,6 +4,7 @@ import com.epmet.support.normalizing.ScoreCalculator;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -12,6 +13,7 @@ public class BatchScoreCalculator {
 
     /**
      * 执行计算，每个指标中每个样本的得分明细
+     *
      * @return 每一条都是一个指标的，所有样本对应的，得分值
      */
     public List<IndexOutputVO> getScoreDetailOfIndexId(List<IndexInputVO> indexInputVOS) {
@@ -26,7 +28,7 @@ public class BatchScoreCalculator {
 
             // 循环同一个指标内的多个样本值的SampleValue列表
             List<SampleScore> scores4OneIndex = indexValueVOs.stream().map(vo -> {
-                BigDecimal score = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold), weight).setScale(6, RoundingMode.HALF_UP);;
+                BigDecimal score = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold), weight).setScale(6, RoundingMode.HALF_UP);
                 return new SampleScore(vo.getSampleId(), score);
             }).collect(Collectors.toList());
 
@@ -34,8 +36,49 @@ public class BatchScoreCalculator {
         }).collect(Collectors.toList());
     }
 
+    /**
+     * 执行计算，以样本的所有指标总得分及明细分数值
+     *
+     * @param indexInputVOS
+     * @return
+     */
+    public HashMap<String, CalculateResult> getScoreTotalOfSampleId(List<IndexInputVO> indexInputVOS) {
+
+        // 每个样本的总得分
+        HashMap<String, CalculateResult> scoreCountOfSamples = new HashMap<>();
+        //遍历指标
+        for (IndexInputVO idx : indexInputVOS) {
+            // 每个指标循环一次
+            List<SampleValue> indexValueVOs = idx.getIndexValueVOs();
+            BigDecimal weight = idx.getWeight();
+            ScoreCalculator scoreCalculator = idx.getScoreCalculator();
+            BigDecimal threshold = idx.getThreshold();
+            //遍历该指标下的每个数据
+            for (SampleValue vo : indexValueVOs) {
+                String sampleId = vo.getSampleId();
+                BigDecimal score = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold), weight).setScale(6, RoundingMode.HALF_UP);
+                CalculateResult result = scoreCountOfSamples.get(sampleId);
+
+                if (result == null) {
+                    score.setScale(6, RoundingMode.HALF_UP);
+                    result = new CalculateResult();
+                    result.setSampleId(sampleId);
+                    result.setTotalScore(new BigDecimal(0));
+                    result.setDetails(new ArrayList<>());
+                    scoreCountOfSamples.put(sampleId, result);
+                }
+                SampleScore sampleScore = new SampleScore(idx.getIndexId(), score);
+                result.getDetails().add(sampleScore);
+                result.setTotalScore(result.getTotalScore().add(score).setScale(6, RoundingMode.HALF_UP));
+            }
+        }
+
+        return scoreCountOfSamples;
+    }
+
     /**
      * 执行计算，以样本的所有指标总得分
+     *
      * @param indexInputVOS
      * @return
      */
@@ -69,6 +112,7 @@ public class BatchScoreCalculator {
 
     /**
      * 获取最终样本值
+     *
      * @param realValue
      * @param threshold
      * @return
@@ -81,6 +125,6 @@ public class BatchScoreCalculator {
         }
         return (bdRealValue.compareTo(threshold) < 0) || (bdRealValue.equals(threshold))
                 ? bdRealValue
-                : threshold ;
+                : threshold;
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/CalculateResult.java

@@ -0,0 +1,25 @@
+package com.epmet.support.normalizing.batch;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class CalculateResult implements Serializable {
+    private static final long serialVersionUID = -7966247924916816940L;
+
+    /**
+     * 样本Id 对应inputVO中的sampleId
+     */
+    private String sampleId;
+    /**
+     * 总得分
+     */
+    private BigDecimal totalScore;
+    /**
+     * 每项具体的分支
+     */
+    private List<SampleScore> details;
+}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml

@@ -90,7 +90,7 @@
             fics.month_id,
             fics.quarter_id,
             fics.year_id,
-            AVG( fics.score ) AS score,
+            ROUND(AVG( fics.score ),6) AS score,
             fics.customer_id,
             PARENT_AGENCY_ID AS parentId
         FROM
@@ -101,7 +101,7 @@
           AND fics.month_id = #{monthId}
           AND fics.index_code = #{indexCode}
             AND fics.DATA_TYPE = #{dataType}
-        GROUP BY fics.agency_id
+        GROUP BY fics.parent_agency_id
     </select>
 
     <insert id="batchInsertAgencyScoreData" parameterType="map">

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

@@ -27,8 +27,8 @@
 
     <delete id="deleteFactIndexGovrnAblityDeptMonthly">
         delete from fact_index_govrn_ablity_dept_monthly
-        where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND DEPT_ID = #{deptId}
-        AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId}
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertFactIndexGovrnAblityDeptMonthly" parameterType="map">

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

@@ -29,8 +29,8 @@
 
     <delete id="deleteFactIndexGovrnAblityGridMonthly">
         delete from fact_index_govrn_ablity_grid_monthly
-        where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId}
-        AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId}
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertFactIndexGovrnAblityGridMonthly" parameterType="map">

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

@@ -30,11 +30,8 @@
     <delete id="deleteFactIndexGovrnAblityOrgMonthly">
         delete from fact_index_govrn_ablity_org_monthly
         where CUSTOMER_ID = #{customerId}
-        AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId} AND YEAR_ID = #{yearId}
-        AND AGENCY_ID IN
-        <foreach item="item" collection="agencyIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertFactIndexGovrnAblityOrgMonthly" parameterType="map">

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

@@ -34,8 +34,8 @@
 
     <delete id="deleteFactIndexPartyAblityGridMonthly">
         delete from fact_index_party_ablity_grid_monthly
-        where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId}
-        AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId} AND YEAR_ID = #{yearId}
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertFactIndexPartyAblityGridMonthly" parameterType="map">

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

@@ -24,11 +24,8 @@
     <delete id="deleteFactIndexPartyAblityOrgMonthly">
         delete from fact_index_party_ablity_org_monthly
         where CUSTOMER_ID = #{customerId}
-        AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId} AND YEAR_ID = #{yearId}
-        AND AGENCY_ID IN
-        <foreach item="item" collection="agencyIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertFactIndexPartyAblityOrgMonthly" parameterType="map">

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

@@ -24,8 +24,8 @@
 
     <delete id="deleteFactIndexServiceAblityGridMonthly">
         delete from fact_index_service_ablity_grid_monthly
-        where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId}
-        AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId} AND YEAR_ID = #{yearId}
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertFactIndexServiceAblityGridMonthly" parameterType="map">

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

@@ -24,11 +24,8 @@
     <delete id="deleteFactIndexServiceAblityOrgMonthly">
         delete from fact_index_service_ablity_org_monthly
         where CUSTOMER_ID = #{customerId}
-        AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId} AND YEAR_ID = #{yearId}
-        AND AGENCY_ID IN
-        <foreach item="item" collection="agencyIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertFactIndexServiceAblityOrgMonthly" parameterType="map">

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

@@ -65,23 +65,23 @@
     <!-- 街道下级所有社区服务能力得分平均值 -->
     <select id="selectSubCommAvgScore" resultType="com.epmet.dto.indexcal.SubCommunityAvgResultDTO">
         SELECT
-            fics.agency_id,
+            fics.PARENT_AGENCY_ID AS agencyId,
             fics.month_id,
             fics.quarter_id,
             fics.year_id,
-            AVG( fics.score ) AS score,
+            ROUND(AVG( fics.score ),6) AS score,
             fics.customer_id,
             sca.pid AS parentId
         FROM
             fact_index_community_score fics
-            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = fics.AGENCY_ID
+            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = fics.PARENT_AGENCY_ID
         WHERE
             fics.del_flag = '0'
           AND sca.DEL_FLAG = 0
           AND fics.customer_id = #{customerId}
           AND fics.month_id = #{monthId}
           AND fics.index_code = #{indexCode}
-        GROUP BY fics.agency_id
+        GROUP BY fics.parent_agency_id
     </select>
 
     <select id="selectListCommunityScore" resultType="com.epmet.dto.screen.FactIndexCommunityScoreDTO">

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

@@ -10,7 +10,7 @@
             figc.month_id as monthId,
             figc.quarter_id as quarterId,
             figc.year_id as yearId,
-            AVG( figc.score ) AS score,
+            ROUND(AVG( figc.score ),6) AS score,
             figc.customer_id as customerId,
             sca.pid AS parentId
         FROM

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

@@ -6,10 +6,7 @@
     <delete id="deleteCpcBaseData">
         delete from screen_cpc_base_data
         where CUSTOMER_ID = #{customerId}
-        AND ORG_ID IN
-        <foreach item="item" collection="orgIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        limit 1000;
     </delete>
 
     <insert id="batchInsertCpcBaseData" parameterType="map">

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

@@ -6,10 +6,7 @@
     <delete id="deleteCustomerAgency">
         delete from screen_customer_agency
         where CUSTOMER_ID = #{customerId}
-        AND AGENCY_ID IN
-        <foreach item="item" collection="agencyIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        limit 1000;
     </delete>
 
     <insert id="batchInsertCustomerAgency" parameterType="map">
@@ -90,4 +87,15 @@
             DEL_FLAG = '0'
             AND CUSTOMER_ID =#{customerId}
     </select>
+
+    <!-- 根据agencyId查询上级组织Id -->
+    <select id="selectPid" resultType="java.lang.String">
+        SELECT
+            pid
+        FROM
+            screen_customer_agency
+        WHERE
+            del_flag = '0'
+          AND agency_id = #{agencyId}
+    </select>
 </mapper>

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

@@ -6,10 +6,7 @@
     <delete id="deleteCustomerDept">
         delete from screen_customer_dept
         where CUSTOMER_ID = #{customerId}
-        AND DEPT_ID IN
-        <foreach item="item" collection="deptIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        limit 1000;
     </delete>
 
     <insert id="batchInsertCustomerDept" parameterType="map">

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

@@ -6,10 +6,7 @@
     <delete id="deleteCustomerGrid">
         delete from screen_customer_grid
         where CUSTOMER_ID = #{customerId}
-        AND GRID_ID IN
-        <foreach item="item" collection="gridIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        limit 1000;
     </delete>
 
     <insert id="batchInsertCustomerGrid" parameterType="map">

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

@@ -5,7 +5,8 @@
 
     <delete id="deleteEventData">
         delete from screen_event_data
-        where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId}
+        where CUSTOMER_ID = #{customerId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertEventData" parameterType="map">

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

@@ -5,11 +5,8 @@
 
     <delete id="deleteGovernRankData">
         delete from screen_govern_rank_data
-        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}
-        </foreach>
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertGovernRankData" parameterType="map">

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

@@ -5,11 +5,8 @@
 
     <delete id="deleteIndexDataMonthly">
         delete from screen_index_data_monthly
-        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}
-        </foreach>
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertIndexDataMonthly" parameterType="map">

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

@@ -6,10 +6,7 @@
     <delete id="deleteIndexDataYearly">
         delete from screen_index_data_yearly
         where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId}
-        AND ORG_ID IN
-        <foreach item="item" collection="orgIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        limit 1000;
     </delete>
 
     <insert id="batchInsertIndexDataYearly" parameterType="map">

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

@@ -5,11 +5,8 @@
 
     <delete id="deleteOrgRankData">
         delete from screen_org_rank_data
-        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}
-        </foreach>
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertOrgRankData" parameterType="map">

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

@@ -5,11 +5,8 @@
 
     <delete id="deletePartyBranchData">
         delete from screen_party_branch_data
-        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}
-        </foreach>
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertPartyBranchData" parameterType="map">

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

@@ -6,10 +6,7 @@
     <delete id="deletePartyLinkMassesData">
         delete from screen_party_link_masses_data
         where CUSTOMER_ID = #{customerId}
-        AND ORG_ID IN
-        <foreach item="item" collection="orgIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        limit 1000;
     </delete>
 
     <insert id="batchInsertPartyLinkMassesData" parameterType="map">

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

@@ -5,7 +5,8 @@
 
     <delete id="deletePartyUserRankData">
         delete from screen_party_user_rank_data
-        where CUSTOMER_ID = #{customerId} AND GRID_ID = #{gridId} AND USER_ID = #{userId}
+        where CUSTOMER_ID = #{customerId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertPartyUserRankData" parameterType="map">

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

@@ -6,10 +6,7 @@
     <delete id="deletePioneerData">
         delete from screen_pioneer_data
         where CUSTOMER_ID = #{customerId}
-        AND ORG_ID IN
-        <foreach item="item" collection="orgIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        limit 1000;
     </delete>
 
     <insert id="batchInsertPioneerData" parameterType="map">

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

@@ -27,10 +27,7 @@
     <delete id="deletePublicPartiTotalData">
         delete from screen_public_parti_total_data
         where CUSTOMER_ID = #{customerId}
-        AND ORG_ID IN
-        <foreach item="item" collection="orgIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        limit 1000;
     </delete>
 
     <insert id="batchInsertPublicPartiTotalData" parameterType="map">

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

@@ -22,11 +22,8 @@
 
     <delete id="deleteUserJoin">
         delete from screen_user_join
-        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}
-        </foreach>
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
     </delete>
 
     <insert id="batchInsertUserJoin" parameterType="map">

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

@@ -6,10 +6,7 @@
     <delete id="deleteUserTotalData">
         delete from screen_user_total_data
         where CUSTOMER_ID = #{customerId}
-        AND ORG_ID IN
-        <foreach item="item" collection="orgIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        limit 1000;
     </delete>
 
     <insert id="batchInsertUserTotalData" parameterType="map">

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/DemoScoreCal.java

@@ -1,10 +1,7 @@
 package com.epmet.stats.test.normalizing;
 
 import com.epmet.support.normalizing.*;
-import com.epmet.support.normalizing.batch.BatchScoreCalculator;
-import com.epmet.support.normalizing.batch.IndexInputVO;
-import com.epmet.support.normalizing.batch.IndexOutputVO;
-import com.epmet.support.normalizing.batch.SampleValue;
+import com.epmet.support.normalizing.batch.*;
 import org.junit.Test;
 
 import java.math.BigDecimal;
@@ -237,12 +234,19 @@ public class DemoScoreCal {
 
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, BigDecimal> result = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
+        HashMap<String, CalculateResult> result2 = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
 
         System.err.println("----------------1----------------");
         result.forEach((key, value) -> {
             System.out.println(key.concat("的得分为:").concat(value.toString()));
         });
         System.err.println("-----------------2---------------");
+
+        System.err.println("----------------11111111----------------");
+        result2.forEach((key, value) -> {
+            System.out.println(key.concat("的得分为:").concat(value.toString()));
+        });
+        System.err.println("-----------------2222222222---------------");
     }
 
 

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -300,7 +300,7 @@ public interface EpmetUserOpenFeignClient {
     /**
      * 更改角色所属组织
      * @author zhaoqifeng
-     * @date 2020/8/31 10:36 
+     * @date 2020/8/31 10:36
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result
      */