Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1594,8 +1594,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             Map<String, Integer> closeProjectStartMap = toProjectStart.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
             Map<String, Integer> closeProjectEndMap = toProjectEnd.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
             //巡查次数和时间
-            List<String> agencyIdList = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
-            List<PatrolDailySumResult> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyIdList,formDTO.getStartDateId(),formDTO.getEndDateId());
+            List<PatrolDailySumResult> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyList,formDTO.getStartDateId(),formDTO.getEndDateId());
             Map<String, PatrolDailySumResult> patrolListMap = patrolList.stream().collect(Collectors.toMap(PatrolDailySumResult::getOrgId, o -> o, (o1, o2) -> o1));
 
             subAgencyList.forEach(agency->{

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

@@ -601,16 +601,15 @@ public class DemoController {
     private CalGridIndexService calGridIndexService;
 
     @PostMapping("gridparty")
-    public void gridParty(){
-        String customerId = "45687aa479955f9d06204d415238f7cc";
-//        String customerId = "epmettest";
-        String monthId = "202009";
+    public Result gridParty(@RequestParam("customerId")String customerId,@RequestParam("monthId")String monthId){
         calGridIndexService.calGridIndexPartyAbility(customerId,monthId);
+        return new Result();
     }
 
     @PostMapping("gridgovern")
-    public void gridGovern(@RequestParam("customerId")String customerId,@RequestParam("monthId")String monthId){
+    public Result gridGovern(@RequestParam("customerId")String customerId,@RequestParam("monthId")String monthId){
         calGridIndexService.calGridIndexGovernAbility(customerId,monthId);
+        return new Result();
     }
 
     @PostMapping("gridservice")

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java

@@ -558,7 +558,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
             gridIssueAllTotalList.forEach(allIssue -> {
                 gridIssueTotalList.forEach(issue -> {
                     if (allIssue.getGridId().equals(issue.getGridId())) {
-                        allIssue.setIssueToProjectRatio(getRound(new BigDecimal(allIssue.getIssueTotal()).divide(new BigDecimal(issue.getIssueTotal()),NumConstant.EIGHT,BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL)));
+                        allIssue.setIssueToProjectRatio(getRound(new BigDecimal(issue.getIssueTotal()).divide(new BigDecimal(allIssue.getIssueTotal()),NumConstant.EIGHT,BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL)));
                     }
                 });
             });