|
@ -91,12 +91,13 @@ public class BizDataStatsServiceImpl implements BizDataStatsService { |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void executeStaffPatrolStats(StaffPatrolStatsFormDTO formDTO) { |
|
|
public void executeStaffPatrolStats(StaffPatrolStatsFormDTO formDTO) { |
|
|
//校正数据
|
|
|
//校正参数里的前一天日期的数据
|
|
|
//获取所有网格员
|
|
|
//获取所有网格员
|
|
|
List<CustomerGridStaffDTO> allGridMembers = getAllGridMembers(formDTO); |
|
|
List<CustomerGridStaffDTO> allGridMembers = getAllGridMembers(formDTO); |
|
|
reloadStaffPatrolStatsData(formDTO, allGridMembers); |
|
|
reloadStaffPatrolStatsData(formDTO, allGridMembers); |
|
|
|
|
|
String currentDateId = DimIdGenerator.getDateDimId(new Date()); |
|
|
|
|
|
|
|
|
//初始化今天的数据
|
|
|
//初始化参数里日期的数据
|
|
|
initStaffPatrolTodayData(formDTO, allGridMembers); |
|
|
initStaffPatrolTodayData(formDTO, allGridMembers); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
@ -263,7 +264,12 @@ public class BizDataStatsServiceImpl implements BizDataStatsService { |
|
|
StaffPatrolStatsFormDTO formDTO = ConvertUtils.sourceToTarget(param, StaffPatrolStatsFormDTO.class); |
|
|
StaffPatrolStatsFormDTO formDTO = ConvertUtils.sourceToTarget(param, StaffPatrolStatsFormDTO.class); |
|
|
if (!isRange) { |
|
|
if (!isRange) { |
|
|
try { |
|
|
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); |
|
|
this.executeStaffPatrolStats(formDTO); |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
log.error("【网格员巡查数据统计】发生异常,参数:" + JSON.toJSONString(formDTO), e); |
|
|
log.error("【网格员巡查数据统计】发生异常,参数:" + JSON.toJSONString(formDTO), e); |
|
|