From 567e3659f9972c9d4821f4148c87581d5fbed3f3 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 19 Aug 2024 15:33:53 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E5=8D=95=E4=BD=8D=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statemachine/action/SelfTestStateChangeAction.java | 1 + .../common/statemachine/action/TenderStateChangeAction.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/SelfTestStateChangeAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/SelfTestStateChangeAction.java index 43f5b28..e5a8ba3 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/SelfTestStateChangeAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/SelfTestStateChangeAction.java @@ -41,6 +41,7 @@ public class SelfTestStateChangeAction { public void SELF_TEST_INFO_PASSED(Message message) { Purchase purchase = getPurchaseInfo(message); purchase.setStatus(TenderTestValidStatus.WITHOUT_TEST_VALID_INFO.getCode()); + purchase.setTestValidStatus(TenderTestValidStatus.WITHOUT_TEST_VALID_INFO.getCode()); purchase.setSelfTestStatus(TenderSelfTestStatus.SELF_TEST_INFO_PASSED.getCode()); } 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 ce4a8b4..8718119 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 @@ -48,7 +48,18 @@ public class TenderStateChangeAction { * @param message \ */ @OnTransition(source = "TO_BE_SUBMIT_PURCHASE_CONSTRUCTION_INFO", target = "TO_BE_SUBMIT_FIRST_INSPECTED_INFO") - public void SUBMIT_PURCHASE_CONSTRUCTION_INFO2(Message message) { + public void SUBMIT_PURCHASE_CONSTRUCTION_INFO_SKIP_TO_FINAL_INSPECT(Message message) { + Purchase purchase = getPurchaseInfo(message); + purchase.setStatus(TenderStatus.TO_BE_SUBMIT_FIRST_INSPECTED_INFO.getCode()); + } + + /** + * 提交单位确认 + * + * @param message \ + */ + @OnTransition(source = "WAIT_ORG_CONFIRM", target = "TO_BE_SUBMIT_FIRST_INSPECTED_INFO") + public void SUBMIT_PURCHASE_ORG_CONFIRM(Message message) { Purchase purchase = getPurchaseInfo(message); purchase.setStatus(TenderStatus.TO_BE_SUBMIT_FIRST_INSPECTED_INFO.getCode()); }