From df7c0dfdf18944b14af996dd5fe30f9d874285e8 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Thu, 22 Aug 2024 14:16:46 +0800
Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E9=80=82=E9=85=8D=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0=E4=B8=AD=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=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/builder/impl/ProjectStateMachineBuilderImpl.java     | 3 ++-
 .../java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/ProjectStateMachineBuilderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/ProjectStateMachineBuilderImpl.java
index 043a812..9b002ab 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/ProjectStateMachineBuilderImpl.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/ProjectStateMachineBuilderImpl.java
@@ -3,6 +3,7 @@ package com.hz.pm.api.common.statemachine.builder.impl;
 import com.hz.pm.api.common.statemachine.builder.BaseStateMachineBuilder;
 import com.hz.pm.api.common.statemachine.event.ProjectStateChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectGuardFactory;
+import com.hz.pm.api.common.statemachine.factory.ProjectGuardFactory.ProjectPurchaseToFirstAcceptGuard;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.enumeration.status.ProjectStatus;
 import lombok.RequiredArgsConstructor;
@@ -154,7 +155,7 @@ public class ProjectStateMachineBuilderImpl implements BaseStateMachineBuilder<P
                 .source(ProjectStatus.ON_PURCHASING)
                 .target(ProjectStatus.TO_BE_FIRST_INSPECTED)
                 .event(ProjectStateChangeEvent.SUBMIT_PURCHASE_CONTRACT_RECORD)
-                .guard(new ProjectGuardFactory.ProjectPurchaseToFirstAcceptGuard())
+                .guard(new ProjectPurchaseToFirstAcceptGuard())
                 .and()
                 // 填写试试计划 -> 待初验
                 .withExternal()
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
index 53b1dc9..11bf04e 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
@@ -451,10 +451,10 @@ public class PurchaseManage {
         contractService.saveOrUpdate(contract);
         // 判断是否所有标项都完成了采购合同备案
         Wrapper<Purchase> select = Wrappers.lambdaQuery(Purchase.class)
-                .select(Purchase::getId, Purchase::getAgency)
+                .select(Purchase::getId, Purchase::getSupplier)
                 .eq(Purchase::getProjectId, projectId);
         List<Purchase> purchases = purchaseService.list(select);
-        if (CollUtil.allMatch(purchases, w -> StrUtil.isNotBlank(w.getAgency()))) {
+        if (CollUtil.allMatch(purchases, w -> StrUtil.isNotBlank(w.getSupplier()))) {
             projectStateMachineUtil.pass(project);
         }
         // 修改项目合同金额