fix: 企标计划状态修复

2024-09-09 20:50:33 +08:00
parent cbf68d98c6
commit 723b2fbe82
1 changed files with 3 additions and 2 deletions
@@ -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());
            }