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 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 approvedProjectNotPurchasedMap = projectStatusChangeService.listLastEventMap(projectCodes, + ProjectStateChangeEvent.DECLARED_RECORD_PASS); + if (CollUtil.isNotEmpty(approvedProjectNotPurchasedMap)) { + projectStatusChangeMap.putAll(approvedProjectNotPurchasedMap); + } } } break; // 已采购未改造完成 获取合同签订时间 case PURCHASED_UNMODIFIED:{ - Map 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 purchasedUnmodifiedMap = projectStatusChangeService.listLastEventMap(projectCodes, + ProjectStateChangeEvent.SUBMIT_PURCHASE_CONTRACT_RECORD); + if (CollUtil.isNotEmpty(purchasedUnmodifiedMap)) { + projectStatusChangeMap.putAll(purchasedUnmodifiedMap); + } } } break; // 已改造完成未终验 获取单位确认时间 case MODIFIED_NOT_FINAL_INSPECTION:{ - Map 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 modifiedNotFinalInspectionMap = projectStatusChangeService.listLastEventMap(projectCodes, + ProjectStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM); + if (CollUtil.isNotEmpty(modifiedNotFinalInspectionMap)) { + projectStatusChangeMap.putAll(modifiedNotFinalInspectionMap); + } } } break;