diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/AdaptAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/AdaptAction.java index b4f423c..5a9796f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/AdaptAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/AdaptAction.java @@ -1,6 +1,7 @@ package com.hz.pm.api.common.statemachine.action; import cn.hutool.core.lang.Assert; +import com.hz.pm.api.common.statemachine.builder.impl.AdaptStateMachineBuilderImpl; import com.hz.pm.api.common.statemachine.builder.impl.TestValidStateMachineBuilderImpl; import com.hz.pm.api.common.statemachine.event.AdaptStateChangeEvent; import com.hz.pm.api.common.statemachine.util.TenderStateMachineUtil; @@ -20,7 +21,7 @@ import org.springframework.statemachine.annotation.WithStateMachine; * @since 17:08 2024/2/24 */ @Slf4j -@WithStateMachine(id = TestValidStateMachineBuilderImpl.MACHINE_ID) +@WithStateMachine(id = AdaptStateMachineBuilderImpl.MACHINE_ID) public class AdaptAction { private Purchase getPurchaseInfo(Message message) { diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/SelfTestAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/SelfTestAction.java index 63d1f01..35418f0 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/SelfTestAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/SelfTestAction.java @@ -1,6 +1,7 @@ package com.hz.pm.api.common.statemachine.action; import cn.hutool.core.lang.Assert; +import com.hz.pm.api.common.statemachine.builder.impl.SelfTestStateMachineBuilderImpl; import com.hz.pm.api.common.statemachine.builder.impl.TestValidStateMachineBuilderImpl; import com.hz.pm.api.common.statemachine.event.SelfTestStateChangeEvent; import com.hz.pm.api.common.statemachine.util.TenderStateMachineUtil; @@ -20,7 +21,7 @@ import org.springframework.statemachine.annotation.WithStateMachine; * @since 17:08 2024/2/24 */ @Slf4j -@WithStateMachine(id = TestValidStateMachineBuilderImpl.MACHINE_ID) +@WithStateMachine(id = SelfTestStateMachineBuilderImpl.MACHINE_ID) public class SelfTestAction { private Purchase getPurchaseInfo(Message message) { diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/SelfTestStateMachineUtil.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/SelfTestStateMachineUtil.java index c994da0..fa60d70 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/SelfTestStateMachineUtil.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/SelfTestStateMachineUtil.java @@ -66,7 +66,7 @@ public class SelfTestStateMachineUtil { } public void execute(Purchase purchase, SelfTestStateChangeEvent event) throws Exception { - log.info("调用状态机前的标段状态为:{}", purchase.getStatus()); + log.info("调用状态机前的标段状态为:{}", purchase.getSelfTestStatus()); // 获取TO状态机 StateMachine stateMachine = selfTestStateMachineBuilder.build(); Message message = MessageBuilder.withPayload(event) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java index 158a0ec..c218485 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java @@ -159,7 +159,7 @@ public class DeclaredRecordManage { queryState = false; break; } - if (queryState) { + if (queryState && !viewUnitIds.isEmpty()) { query.in(MhProject::getUnitId, viewUnitIds); } }