diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/TenderStateChangeAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/TenderStateChangeAction.java index 4f5ce8c..0272c03 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/TenderStateChangeAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/TenderStateChangeAction.java @@ -55,7 +55,6 @@ public class TenderStateChangeAction { @OnTransition(source = "ON_PURCHASE_NOTICE_APPLY", target = "TO_BE_SUBMIT_PURCHASE_CONSTRUCTION_INFO") public void PURCHASE_NOTICE_PASSED(Message message) { Purchase purchase = getPurchaseInfo(message); - purchase.setXcfhxApplyStatus(TenderXcfhxApplyStatus.TO_BE_SUBMIT_XCFHX_APPLY.getCode()); purchase.setStatus(TenderMainStatus.TO_BE_SUBMIT_PURCHASE_CONSTRUCTION_INFO.getCode()); } @@ -121,10 +120,11 @@ public class TenderStateChangeAction { * * @param message \ */ - @OnTransition(source = "TO_BE_SUBMIT_FIRST_INSPECTED_INFO", target = "TO_BE_SUBMIT_FINALLY_INSPECTED_APPLY") + @OnTransition(source = "TO_BE_SUBMIT_FIRST_INSPECTED_INFO", target = "TO_BE_SUBMIT_XCFHX_APPLY") public void SUBMIT_FIRST_INSPECTED_FILES(Message message) { Purchase purchase = getPurchaseInfo(message); - purchase.setStatus(TenderMainStatus.TO_BE_SUBMIT_FINALLY_INSPECTED_APPLY.getCode()); + purchase.setStatus(TenderXcfhxApplyStatus.TO_BE_SUBMIT_XCFHX_APPLY.getCode()); + purchase.setXcfhxApplyStatus(TenderXcfhxApplyStatus.TO_BE_SUBMIT_XCFHX_APPLY.getCode()); } /** diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/TenderStateMachineBuilderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/TenderStateMachineBuilderImpl.java index 13da56f..55d76c1 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/TenderStateMachineBuilderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/TenderStateMachineBuilderImpl.java @@ -76,6 +76,7 @@ public class TenderStateMachineBuilderImpl implements BaseStateMachineBuilder states = ListUtil.toList(TenderMainStatus.values()); states.add(TenderAdaptStatus.WITHOUT_ADAPT_INFO); + states.add(TenderXcfhxApplyStatus.TO_BE_SUBMIT_XCFHX_APPLY); builder.configureStates() .withStates()