入参修改

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

@@ -486,17 +486,13 @@ public class DemoController {
     }
 
     @PostMapping("streetZxc")
-    public void getStreet(){
+    public void getStreet(@RequestBody CalculateCommonFormDTO form){
-        String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
+        indexCalculateStreetService.calStreetAll(form);
-        String monthId = "202009";
-        indexCalculateStreetService.calStreetAll(customerId,monthId);
     }
 
     @PostMapping("districtZxc")
-    public void getDistrict(){
+    public void getDistrict(@RequestBody CalculateCommonFormDTO form){
-        String customerId = "45687aa479955f9d06204d415238f7cc";
+        indexCalculateDistrictService.calDistrictAll(form);
-        String monthId = "202009";
-        indexCalculateDistrictService.calDistrictAll(customerId,monthId);
     }
     @PostMapping("gridZxc")
     public void getGrid(){

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

@@ -1,5 +1,7 @@
 package com.epmet.service.evaluationindex.indexcal;
 
+import com.epmet.dto.indexcal.CalculateCommonFormDTO;
+
 /**
  * @Author zxc
  * @DateTime 2020/9/4 9:03 上午
@@ -8,11 +10,10 @@ public interface IndexCalculateDistrictService {
 
     /**
      * @Description  计算全区相关总分
-     * @param customerId
+     * @param form
-     * @param monthId
      * @author zxc
      * @date 2020/9/2 3:12 下午
      */
-    Boolean calDistrictAll(String customerId, String monthId);
+    Boolean calDistrictAll(CalculateCommonFormDTO form);
 
 }

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

@@ -1,5 +1,7 @@
 package com.epmet.service.evaluationindex.indexcal;
 
+import com.epmet.dto.indexcal.CalculateCommonFormDTO;
+
 /**
  * @Author zxc
  * @DateTime 2020/9/2 3:11 下午
@@ -8,11 +10,10 @@ public interface IndexCalculateStreetService {
 
     /**
      * @Description  计算街道相关总分
-     * @param customerId
+     * @param form
-     * @param monthId
      * @author zxc
      * @date 2020/9/2 3:12 下午
      */
-    Boolean calStreetAll(String customerId, String monthId);
+    Boolean calStreetAll(CalculateCommonFormDTO form);
 
 }

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

@@ -79,14 +79,15 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
     private AgencySelfSubScoreDao agencySelfSubScoreDao;
 
     /**
-     * @param customerId
+     * @param form
-     * @param monthId
      * @Description 计算全区相关总分
      * @author zxc
      * @date 2020/9/2 3:12 下午
      */
     @Override
-    public Boolean calDistrictAll(String customerId, String monthId) {
+    public Boolean calDistrictAll(CalculateCommonFormDTO form) {
+        String customerId = form.getCustomerId();
+        String monthId = form.getMonthId();
         Boolean aBoolean = districtPartyCalculate(customerId, monthId);//党建能力
         if (!aBoolean.equals(true)) {
             throw new RenException("calculate district-party-ability failure ......");

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

@@ -144,7 +144,7 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                 //计算街道
                 start = System.currentTimeMillis();
                 try {
-                    flag = indexCalculateStreetService.calStreetAll(customerId, formDTO.getMonthId());
+                    flag = indexCalculateStreetService.calStreetAll(formDTO);
                     log.info("客户Id：{}【街道相关】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                 } catch (Exception e) {
                     log.error("indexCalculate calStreetAll exception", e);
@@ -162,7 +162,7 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                 //计算全区
                 start = System.currentTimeMillis();
                 try {
-                    flag = indexCalculateDistrictService.calDistrictAll(customerId, formDTO.getMonthId());
+                    flag = indexCalculateDistrictService.calDistrictAll(formDTO);
                     log.info("客户Id：{}【全区相关】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                 } catch (Exception e) {
                     log.error("indexCalculate calDistrictAll exception", e);

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

@@ -82,14 +82,15 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
     private AgencySelfSubScoreDao agencySelfSubScoreDao;
 
     /**
-     * @param customerId
+     * @param form
-     * @param monthId
      * @Description 计算街道相关总分
      * @author zxc
      * @date 2020/9/2 3:12 下午
      */
     @Override
-    public Boolean calStreetAll(String customerId, String monthId) {
+    public Boolean calStreetAll(CalculateCommonFormDTO form) {
+        String customerId = form.getCustomerId();
+        String monthId = form.getMonthId();
         Boolean aBoolean = streetPartyCalculate(customerId, monthId);//党建能力
         if (!aBoolean.equals(true)) {
             throw new RenException("calculate street-party-ability failure ......");