From 85e8b36fd05e77e3e29e45de7051213113fc1258 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 6 Jul 2021 15:38:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/biz/impl/BizDataStatsServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java index e5a322b1bf..4e3e6ba211 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java +++ b/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 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);