定时任务修改参数

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

@@ -91,12 +91,13 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
 
     @Override
     public void executeStaffPatrolStats(StaffPatrolStatsFormDTO formDTO) {
-        //校正数据
+        //校正参数里的前一天日期的数据
         //获取所有网格员
         List<CustomerGridStaffDTO> allGridMembers = getAllGridMembers(formDTO);
         reloadStaffPatrolStatsData(formDTO, allGridMembers);
+        String currentDateId = DimIdGenerator.getDateDimId(new Date());
 
-        //初始化今天的数据
+        //初始化参数里日期的数据
         initStaffPatrolTodayData(formDTO, allGridMembers);
 
     }
@@ -144,7 +145,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
                 //项目立项时间 在巡查期间时 总数加1
                 long projectCreateTime = projectDTO.getCreatedTime().getTime();
                 //创建人为网格员 且时间在巡查期间的 则上报的项目数加1
-                if (projectDTO.getCreatedBy().equals(patrol.getStaffId()) && projectCreateTime>= patrol.getPatrolStartTime().getTime() && projectCreateTime <= patrol.getPatrolEndTime().getTime()) {
+                if (projectDTO.getCreatedBy().equals(patrol.getStaffId()) && projectCreateTime >= patrol.getPatrolStartTime().getTime() && projectCreateTime <= patrol.getPatrolEndTime().getTime()) {
                     String unqPatrolKey = getUnqPatrolKey(patrol.getGrid(), patrol.getStaffId());
                     StatsStaffPatrolRecordDailyDTO recordDailyDTO = yesterdayStatsMap.get(unqPatrolKey);
                     if (recordDailyDTO == null) {
@@ -263,7 +264,12 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
             StaffPatrolStatsFormDTO formDTO = ConvertUtils.sourceToTarget(param, StaffPatrolStatsFormDTO.class);
             if (!isRange) {
                 try {
-                    formDTO.setDateId(param.getDateId());
+                    //执行参数改为今天
+                    Date parse = DateUtils.parse(param.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD);
+                    Date addDateId = DateUtils.addDateDays(parse, NumConstant.ONE);
+                    String dateDimId = DimIdGenerator.getDateDimId(addDateId);
+                    formDTO.setDateId(dateDimId);
+                    //初始化form里的今天的数据 并纠正昨日的数据
                     this.executeStaffPatrolStats(formDTO);
                 } catch (Exception e) {
                     log.error("【网格员巡查数据统计】发生异常,参数:" + JSON.toJSONString(formDTO), e);