From 20938c74e54dc74ab4ee1be12644a0b702386a6c Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 17 Sep 2024 21:03:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=89=80=E6=9C=89=E8=BF=9B=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=90=A6=E9=80=BE=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/enterprise/job/ESPlanProjectStatusJob.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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("计划状态更新完成"); }