From 17690134599535d36a8fce28ecf60c0da3b7c737 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Sat, 31 Aug 2024 17:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9E=E5=90=8E=E9=A2=84=E8=AD=A6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/EarlyWarningWithoutSubmitTask.java        | 36 +++++++++++++---------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningWithoutSubmitTask.java b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningWithoutSubmitTask.java
index 05b043f..3fea589 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningWithoutSubmitTask.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningWithoutSubmitTask.java
@@ -125,31 +125,37 @@ public class EarlyWarningWithoutSubmitTask {
                         switch (flowType) {
                             // 已立项未采购 获取 立项时间
                             case APPROVED_PROJECT_NOT_PURCHASED:{
-                                Map<String, ProjectStatusChange> approvedProjectNotPurchasedMap = projectStatusChangeService.listLastEventMap(projectCodes,
-                                        ProjectStateChangeEvent.DECLARED_RECORD_PASS);
-                                if (CollUtil.isNotEmpty(approvedProjectNotPurchasedMap)){
-                                    projectStatusChangeMap.putAll(approvedProjectNotPurchasedMap);
-                                    stepName = TaskConstant.StepName.PURCHASE;
+                                stepName = TaskConstant.StepName.PURCHASE;
+                                if (CollUtil.isNotEmpty(projectCodes)) {
+                                    Map<String, ProjectStatusChange> approvedProjectNotPurchasedMap = projectStatusChangeService.listLastEventMap(projectCodes,
+                                            ProjectStateChangeEvent.DECLARED_RECORD_PASS);
+                                    if (CollUtil.isNotEmpty(approvedProjectNotPurchasedMap)) {
+                                        projectStatusChangeMap.putAll(approvedProjectNotPurchasedMap);
+                                    }
                                 }
                             }
                             break;
                             // 已采购未改造完成 获取合同签订时间
                             case PURCHASED_UNMODIFIED:{
-                                Map<String, ProjectStatusChange> purchasedUnmodifiedMap = projectStatusChangeService.listLastEventMap(projectCodes,
-                                        ProjectStateChangeEvent.SUBMIT_PURCHASE_CONTRACT_RECORD);
-                                if (CollUtil.isNotEmpty(purchasedUnmodifiedMap)){
-                                    projectStatusChangeMap.putAll(purchasedUnmodifiedMap);
-                                    stepName = TaskConstant.StepName.ADAPT_MODIFY;
+                                stepName = TaskConstant.StepName.ADAPT_MODIFY;
+                                if (CollUtil.isNotEmpty(projectCodes)) {
+                                    Map<String, ProjectStatusChange> purchasedUnmodifiedMap = projectStatusChangeService.listLastEventMap(projectCodes,
+                                            ProjectStateChangeEvent.SUBMIT_PURCHASE_CONTRACT_RECORD);
+                                    if (CollUtil.isNotEmpty(purchasedUnmodifiedMap)) {
+                                        projectStatusChangeMap.putAll(purchasedUnmodifiedMap);
+                                    }
                                 }
                             }
                             break;
                             // 已改造完成未终验 获取单位确认时间
                             case MODIFIED_NOT_FINAL_INSPECTION:{
-                                Map<String, ProjectStatusChange> modifiedNotFinalInspectionMap = projectStatusChangeService.listLastEventMap(projectCodes,
-                                        ProjectStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM);
-                                if (CollUtil.isNotEmpty(modifiedNotFinalInspectionMap)){
-                                    projectStatusChangeMap.putAll(modifiedNotFinalInspectionMap);
-                                    stepName = TaskConstant.StepName.FINAL;
+                                stepName = TaskConstant.StepName.FINAL;
+                                if (CollUtil.isNotEmpty(projectCodes)) {
+                                    Map<String, ProjectStatusChange> modifiedNotFinalInspectionMap = projectStatusChangeService.listLastEventMap(projectCodes,
+                                            ProjectStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM);
+                                    if (CollUtil.isNotEmpty(modifiedNotFinalInspectionMap)) {
+                                        projectStatusChangeMap.putAll(modifiedNotFinalInspectionMap);
+                                    }
                                 }
                             }
                             break;