diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java index fb0e95f5..55571bad 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java @@ -52,6 +52,9 @@ public class ESPlanProjectStatusJob implements Job { .filter(esp -> ESPChangeType.CANCEL.getValue().equals(esp.getChangeStatus()) || ESPChangeType.WORK_TERMINATE.getValue().equals(esp.getChangeStatus())) .collect(Collectors.toList()); + List inprogressList = list.stream() + .filter(esp -> ESPProjectStatus.IN_PROGRESS.getValue().equals(esp.getProjectStatus())) + .collect(Collectors.toList()); // 将工作中止和取消的设置为未开始 cancelList.forEach(esp -> { esp.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue()); @@ -70,6 +73,15 @@ public class ESPlanProjectStatusJob implements Job { p.setProjectStatus(ESPProjectStatus.OVERDUE.getValue()); } }); + // 判断所有进行中的是否逾期 + inprogressList.parallelStream().forEach(p -> { + Date planApprovalDate = p.getPlanApprovalDate(); + if (curDate.after(planApprovalDate)) { + log.info("计划【" + p.getNewEnStandardName() + "】逾期,计划完成日期:" + p.getPlanApprovalDate()); + p.setProjectStatus(ESPProjectStatus.OVERDUE.getValue()); + } + }); + espService.updateBatchById(inprogressList); espService.updateBatchById(notStartedList); log.info("计划状态更新完成"); }