适配改造、系统自测状态机修改

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<AdaptStateChangeEvent> message) {

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<SelfTestStateChangeEvent> message) {

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<TenderSelfTestStatusEnum, SelfTestStateChangeEvent> stateMachine = selfTestStateMachineBuilder.build();
         Message<SelfTestStateChangeEvent> message = MessageBuilder.withPayload(event)

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);
             }
         }