@@ -234,7 +234,7 @@ public class EarlyWarningProjectTask { | |||||
} | } | ||||
break; | break; | ||||
// 已采购未改造完成 当用户适配改造完成已完成单位确认 说明进度正常 | // 已采购未改造完成 当用户适配改造完成已完成单位确认 说明进度正常 | ||||
case MODIFIED_NOT_FINAL_INSPECTION:{ | |||||
case PURCHASED_UNMODIFIED:{ | |||||
List<TenderStateChangeEvent> events = Lists.newArrayList(); | List<TenderStateChangeEvent> events = Lists.newArrayList(); | ||||
events.add(TenderStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM); | events.add(TenderStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM); | ||||
PurchaseStatusChange purchaseStatusChange = purchaseStatusChangeService.getLastOne(projectCode, events); | PurchaseStatusChange purchaseStatusChange = purchaseStatusChangeService.getLastOne(projectCode, events); | ||||
@@ -250,7 +250,7 @@ public class EarlyWarningProjectTask { | |||||
} | } | ||||
break; | break; | ||||
// 已改造完成未终验 当用户提交终验申请 说明进度正常 | // 已改造完成未终验 当用户提交终验申请 说明进度正常 | ||||
case PURCHASED_UNMODIFIED:{ | |||||
case MODIFIED_NOT_FINAL_INSPECTION:{ | |||||
List<ProjectStateChangeEvent> events = Lists.newArrayList(); | List<ProjectStateChangeEvent> events = Lists.newArrayList(); | ||||
events.add(ProjectStateChangeEvent.FINAL_ACCEPTANCE_APPLICATION); | events.add(ProjectStateChangeEvent.FINAL_ACCEPTANCE_APPLICATION); | ||||
ProjectStatusChange projectStatusChange = projectStatusChangeService.getLastOne(projectCode, events); | ProjectStatusChange projectStatusChange = projectStatusChangeService.getLastOne(projectCode, events); | ||||
@@ -371,7 +371,7 @@ public class DelayWarningTest extends AppTests { | |||||
} | } | ||||
break; | break; | ||||
// 已采购未改造完成 当用户适配改造完成已完成单位确认 说明进度正常 | // 已采购未改造完成 当用户适配改造完成已完成单位确认 说明进度正常 | ||||
case MODIFIED_NOT_FINAL_INSPECTION:{ | |||||
case PURCHASED_UNMODIFIED:{ | |||||
List<TenderStateChangeEvent> events = Lists.newArrayList(); | List<TenderStateChangeEvent> events = Lists.newArrayList(); | ||||
events.add(TenderStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM); | events.add(TenderStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM); | ||||
PurchaseStatusChange purchaseStatusChange = purchaseStatusChangeService.getLastOne(projectCode, events); | PurchaseStatusChange purchaseStatusChange = purchaseStatusChangeService.getLastOne(projectCode, events); | ||||
@@ -387,7 +387,7 @@ public class DelayWarningTest extends AppTests { | |||||
} | } | ||||
break; | break; | ||||
// 已改造完成未终验 当用户提交终验申请 说明进度正常 | // 已改造完成未终验 当用户提交终验申请 说明进度正常 | ||||
case PURCHASED_UNMODIFIED:{ | |||||
case MODIFIED_NOT_FINAL_INSPECTION:{ | |||||
List<ProjectStateChangeEvent> events = Lists.newArrayList(); | List<ProjectStateChangeEvent> events = Lists.newArrayList(); | ||||
events.add(ProjectStateChangeEvent.FINAL_ACCEPTANCE_APPLICATION); | events.add(ProjectStateChangeEvent.FINAL_ACCEPTANCE_APPLICATION); | ||||
ProjectStatusChange projectStatusChange = projectStatusChangeService.getLastOne(projectCode, events); | ProjectStatusChange projectStatusChange = projectStatusChangeService.getLastOne(projectCode, events); | ||||