Merge remote-tracking branch 'remotes/origin/dev'

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

@@ -130,6 +130,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
         List<StatsStaffPatrolRecordDailyDTO> insertList = buildInitPatrolStatsData(formDTO, allGridMembers);
 
         Map<String, StatsStaffPatrolRecordDailyDTO> yesterdayStatsMap = insertList.stream().collect(Collectors.toMap(o -> o.getGridId() + o.getStaffId(), o -> o, (o1, o2) -> o1));
+        log.info("reloadStaffPatrolStatsData 所有网格员数据{}",JSON.toJSONString(yesterdayStatsMap));
         //获取昨日的巡查记录
         List<StaffPatrolRecordResult> yesterdayPatrolList = userService.selectStaffPatrolListByDateId(formDTO.getCustomerId(), formDTO.getDateId());
 
@@ -138,7 +139,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
 
         //获取昨日的例行工作数据
         List<PatrolRoutineWorkResult> yesterdayWorkList = userService.selectRoutineWorkListByDateId(formDTO.getCustomerId(), formDTO.getDateId());
-
+        log.info("reloadStaffPatrolStatsData 例行工作数据数据{}",JSON.toJSONString(yesterdayWorkList));
         //遍历网格员 设置其 巡查次数 巡查时常 上报项目数
         yesterdayPatrolList.forEach(patrolRecord -> {
             String key = patrolRecord.getGrid().concat(patrolRecord.getStaffId());
@@ -172,7 +173,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
                     String unqPatrolKey = getUnqPatrolKey(patrol.getGrid(), patrol.getStaffId());
                     StatsStaffPatrolRecordDailyDTO recordDailyDTO = yesterdayStatsMap.get(unqPatrolKey);
                     if (recordDailyDTO == null) {
-                        log.error("have project data but have any patrolRecordDaily,gridId:{},staffId:{}", patrol.getGrid(), patrol.getStaffId());
+                        log.error("reloadStaffPatrolStatsData have project data but have any patrolRecordDaily,gridId:{},staffId:{}", patrol.getGrid(), patrol.getStaffId());
                         return;
                     }
 
@@ -181,9 +182,13 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
             });
         });
         yesterdayWorkList.forEach(work->{
-            String key = work.getGridId().concat(work.getUserId());
+            String key = getUnqPatrolKey(work.getGridId(),work.getUserId());
+            if ("a47337f6b67dd3ce5d45e32603029ad0".equals(work.getUserId())){
+                log.info("reloadStaffPatrolStatsData 问题用户 例行工作数据{}",JSON.toJSONString(work));
+            }
             StatsStaffPatrolRecordDailyDTO patrolRecordDailyDTO = yesterdayStatsMap.get(key);
             if (patrolRecordDailyDTO == null){
+                log.warn("reloadStaffPatrolStatsData getRoutineWorkCount key{} not exist in gridMembers",key);
                 return;
             }
             patrolRecordDailyDTO.setRoutineWorkCount(patrolRecordDailyDTO.getRoutineWorkCount() + NumConstant.ONE);