diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningProjectTask.java b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningProjectTask.java index 61d9b72..6fd7a9b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningProjectTask.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/EarlyWarningProjectTask.java @@ -234,7 +234,7 @@ public class EarlyWarningProjectTask { } break; // 已采购未改造完成 当用户适配改造完成已完成单位确认 说明进度正常 - case MODIFIED_NOT_FINAL_INSPECTION:{ + case PURCHASED_UNMODIFIED:{ List events = Lists.newArrayList(); events.add(TenderStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM); PurchaseStatusChange purchaseStatusChange = purchaseStatusChangeService.getLastOne(projectCode, events); @@ -250,7 +250,7 @@ public class EarlyWarningProjectTask { } break; // 已改造完成未终验 当用户提交终验申请 说明进度正常 - case PURCHASED_UNMODIFIED:{ + case MODIFIED_NOT_FINAL_INSPECTION:{ List events = Lists.newArrayList(); events.add(ProjectStateChangeEvent.FINAL_ACCEPTANCE_APPLICATION); ProjectStatusChange projectStatusChange = projectStatusChangeService.getLastOne(projectCode, events); diff --git a/hz-pm-api/src/test/java/com/hz/pm/api/warning/DelayWarningTest.java b/hz-pm-api/src/test/java/com/hz/pm/api/warning/DelayWarningTest.java index 46aa3fc..8942192 100644 --- a/hz-pm-api/src/test/java/com/hz/pm/api/warning/DelayWarningTest.java +++ b/hz-pm-api/src/test/java/com/hz/pm/api/warning/DelayWarningTest.java @@ -371,7 +371,7 @@ public class DelayWarningTest extends AppTests { } break; // 已采购未改造完成 当用户适配改造完成已完成单位确认 说明进度正常 - case MODIFIED_NOT_FINAL_INSPECTION:{ + case PURCHASED_UNMODIFIED:{ List events = Lists.newArrayList(); events.add(TenderStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM); PurchaseStatusChange purchaseStatusChange = purchaseStatusChangeService.getLastOne(projectCode, events); @@ -387,7 +387,7 @@ public class DelayWarningTest extends AppTests { } break; // 已改造完成未终验 当用户提交终验申请 说明进度正常 - case PURCHASED_UNMODIFIED:{ + case MODIFIED_NOT_FINAL_INSPECTION:{ List events = Lists.newArrayList(); events.add(ProjectStateChangeEvent.FINAL_ACCEPTANCE_APPLICATION); ProjectStatusChange projectStatusChange = projectStatusChangeService.getLastOne(projectCode, events);