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 2bbe4155..8ec7b581 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 @@ -60,7 +60,7 @@ public class ESPlanProjectStatusJob implements Job { if (null == p.getPlanApprovalDate()) { return; } - if (p.getPlanApprovalDate().after(p.getApprovalDate()) + if (p.getApprovalDate() != null && p.getPlanApprovalDate().after(p.getApprovalDate()) || (null == p.getApprovalDate() && curDate.before(p.getPlanApprovalDate()))) { log.info("计划【" + p.getNewEnStandardName() + "】进行中,计划完成日期:" + p.getPlanApprovalDate()); p.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue());