|
@ -270,14 +270,14 @@ public class BizDataStatsServiceImpl implements BizDataStatsService { |
|
|
//如果没有设置开始日期、结束日期,默认查询今天
|
|
|
//如果没有设置开始日期、结束日期,默认查询今天
|
|
|
param.setDateId(DimIdGenerator.getDateDimId(new Date())); |
|
|
param.setDateId(DimIdGenerator.getDateDimId(new Date())); |
|
|
} |
|
|
} |
|
|
boolean isRange = StringUtils.isBlank(param.getDateId()); |
|
|
StaffPatrolStatsFormDTO formDTO = ConvertUtils.sourceToTarget(param, StaffPatrolStatsFormDTO.class); |
|
|
|
|
|
boolean isRange = StringUtils.isBlank(formDTO.getDateId()); |
|
|
List<String> daysBetween = null; |
|
|
List<String> daysBetween = null; |
|
|
if (isRange) { |
|
|
if (isRange) { |
|
|
daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate()); |
|
|
daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate()); |
|
|
} |
|
|
} |
|
|
List<String> finalDaysBetween = daysBetween; |
|
|
List<String> finalDaysBetween = daysBetween; |
|
|
threadPool.submit(() -> { |
|
|
threadPool.submit(() -> { |
|
|
StaffPatrolStatsFormDTO formDTO = ConvertUtils.sourceToTarget(param, StaffPatrolStatsFormDTO.class); |
|
|
|
|
|
if (!isRange) { |
|
|
if (!isRange) { |
|
|
try { |
|
|
try { |
|
|
//初始化form里的今天的数据 并纠正昨日的数据
|
|
|
//初始化form里的今天的数据 并纠正昨日的数据
|
|
|