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

@@ -183,20 +183,20 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
         });
         yesterdayWorkList.forEach(work->{
             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);
+            if ("a47337f6b67dd3ce5d45e32603029ad0".equals(work.getUserId())){
+                log.info("reloadStaffPatrolStatsData 问题用户 例行工作数据{},累加次数:{}",JSON.toJSONString(work),patrolRecordDailyDTO.getRoutineWorkCount());
+            }
 
         });
 
         Integer effectRow = statsStaffPatrolService.delAndInsertBatch(formDTO, insertList);
-        log.debug("initStaffPatrolStats insert rows:{}", effectRow);
+        log.info("initStaffPatrolStats insert rows:{}", JSON.toJSONString(insertList));
     }
 
     /**