|
@@ -354,7 +354,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
|
|
|
task.getValue()
|
|
|
.parallelStream()
|
|
|
.filter(info -> info.getGenerationdate() == null ||
|
|
|
- JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) == info.getInspectioncycle()
|
|
|
+ JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) >= info.getInspectioncycle()
|
|
|
).forEach(apsHazardInvestigationTemplateZibiaoDo -> {
|
|
|
updateGenerationDateDo[0] = new ApsHazardInvestigationTemplateZibiaoDo();
|
|
|
dataMap.computeIfAbsent(startInstance.getTime().getTime() + ";" + endInstance.getTime().getTime(), k -> new ArrayList<>()).add(apsHazardInvestigationTemplateZibiaoDo);
|
|
@@ -403,7 +403,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
|
|
|
task.getValue()
|
|
|
.parallelStream()
|
|
|
.filter(info -> info.getGenerationdate() == null ||
|
|
|
- JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) == info.getInspectioncycle())
|
|
|
+ JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) >= info.getInspectioncycle())
|
|
|
.forEach(apsHazardInvestigationTemplateZibiaoDo -> {
|
|
|
updateGenerationDateDo[0] = new ApsHazardInvestigationTemplateZibiaoDo();
|
|
|
dataMap.computeIfAbsent(startInstance.getTime().getTime() + ";" + endInstance.getTime().getTime(), k -> new ArrayList<>()).add(apsHazardInvestigationTemplateZibiaoDo);
|
|
@@ -429,7 +429,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
|
|
|
// 如果当前时间是1月1号直接生成隐患任务
|
|
|
task.getValue().parallelStream()
|
|
|
.filter(info -> info.getGenerationdate() == null ||
|
|
|
- JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) == info.getInspectioncycle())
|
|
|
+ JSCommonUtils.dateDifferenceExample(info.getGenerationdate(), today, checkCycleUnit) >= info.getInspectioncycle())
|
|
|
.forEach(apsHazardInvestigationTemplateZibiaoDo -> {
|
|
|
updateGenerationDateDo[0] = new ApsHazardInvestigationTemplateZibiaoDo();
|
|
|
dataMap.computeIfAbsent(startInstance.getTime().getTime() + ";" + endInstance.getTime().getTime(), k -> new ArrayList<>()).add(apsHazardInvestigationTemplateZibiaoDo);
|