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

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

@@ -2005,10 +2005,6 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
 
         //获取例行工作次数
         List<CustomerDataManageResultDTO.CustomerDataManage>  workCountList = statsStaffPatrolRecordDailyService.getPatrolRecordCount(patrolForm);
-        Map<String, List<CustomerDataManageResultDTO.CustomerDataManage>> workCountMap = null;
-        if(workCountList != null && workCountList.size() > NumConstant.ZERO && workCountList.get(NumConstant.ZERO) != null){
-            workCountMap = workCountList.stream().collect(Collectors.groupingBy(CustomerDataManageResultDTO.CustomerDataManage::getOrgId));
-        }
         //NumConstant.FOUR.判断是否需要查询起始日期用户、群组、话题、议题、项目、巡查数据
         HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> uStartMap = new HashMap<>();
         HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> gStartMap = new HashMap<>();
@@ -2083,7 +2079,6 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
             String patrolDuration = "";
             int patrolDurationInteger = NumConstant.ZERO;
             HashSet set = new HashSet();
-            List<CustomerDataManageResultDTO.CustomerDataManage> workCountListTemp;
             for (CustomerDataManageResultDTO.CustomerDataManage u : patrolEnd) {
                 if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) && org.getOrgId().equals(u.getOrgId())) {
                     patroCount += u.getPatrolCount();
@@ -2099,24 +2094,17 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
             }
             //例行工作次数累加
             int patrolRoutineWorkTimes = NumConstant.ZERO;
-            if (workCountMap != null){
-                workCountListTemp = workCountMap.get(org.getOrgId());
-                if (CollectionUtils.isNotEmpty(workCountListTemp)) {
-                    if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
-                        for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
+            if (CollectionUtils.isNotEmpty(workCountList) && workCountList.get(NumConstant.ZERO) != null) {
+                for (CustomerDataManageResultDTO.CustomerDataManage work : workCountList) {
+                    if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) && org.getOrgId().equals(work.getOrgId())) {
                         patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
                         set.add(work.getStaffId());
-                        }
-                    } else {
-                        if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
-                            for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
+                    } else if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) && work.getOrgId().contains(org.getOrgId())) {
                         patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
                         set.add(work.getStaffId());
                     }
                 }
             }
-                }
-            }
 
             patro = set.size();
             Integer minutes = patrolDurationInteger / 60;