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()); }