From 723b2fbe8277233817bce877ca943b96095a3efb Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 9 Sep 2024 20:50:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/enterprise/job/ESPlanProjectStatusJob.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 430a68fd..2bbe4155 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 @@ -57,10 +57,11 @@ public class ESPlanProjectStatusJob implements Job { espService.updateBatchById(inProgressList); // 判断所有逾期的流程是否还是逾期 overdueList.forEach(p -> { - if (null == p.getApprovalDate()) { + if (null == p.getPlanApprovalDate()) { return; } - if (null != p.getPlanApprovalDate() && p.getPlanApprovalDate().after(p.getApprovalDate())) { + if (p.getPlanApprovalDate().after(p.getApprovalDate()) + || (null == p.getApprovalDate() && curDate.before(p.getPlanApprovalDate()))) { log.info("计划【" + p.getNewEnStandardName() + "】进行中，计划完成日期：" + p.getPlanApprovalDate()); p.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); }