From 95241779018d21fdc2f44c4a6c774062e67ce544 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 27 Sep 2023 17:10:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=202=E8=BE=B9=E9=83=BD?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java   | 4 ++--
 .../com/ningdatech/pmapi/projectdeclared/model/entity/Purchase.java   | 2 +-
 .../com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java     | 2 +-
 .../java/com/ningdatech/pmapi/projectlib/mapper/ProjectMapper.xml     | 4 ++--
 .../ningdatech/pmapi/projectCollection/ProjectCollection2Test.java    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java
index bc24071..a9f825d 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java
@@ -51,8 +51,8 @@ public class PurchaseSaveDTO {
         @ApiModelProperty("供应商社会信用代码")
         private String supplierSocialCreditCode;
 
-        @ApiModelProperty("采购方式 1公开招标 2自行采购")
-        private Integer purchaseMethod;
+        @ApiModelProperty("采购方式")
+        private String purchaseMethod;
 
         @ApiModelProperty("成交金额")
         private BigDecimal transactionAmount;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/Purchase.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/Purchase.java
index c1fd6b5..659b58e 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/Purchase.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/Purchase.java
@@ -61,7 +61,7 @@ public class Purchase {
     private String supplierSocialCreditCode;
 
     @ApiModelProperty("采购方式 1公开招标 2自行采购")
-    private Integer purchaseMethod;
+    private String purchaseMethod;
 
     @ApiModelProperty("成交金额")
     private BigDecimal transactionAmount;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java
index 2485d54..55f99d8 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java
@@ -53,7 +53,7 @@ public class PurchaseVO {
     private String supplierSocialCreditCode;
 
     @ApiModelProperty("采购方式 1公开招标 2自行采购")
-    private Integer purchaseMethod;
+    private String purchaseMethod;
 
     @ApiModelProperty("成交金额")
     private BigDecimal transactionAmount;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectMapper.xml
index a5cf155..d648542 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectMapper.xml
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectMapper.xml
@@ -293,10 +293,10 @@
             and p.approval_amount &lt;= #{req.approveAmountMax}
         </if>
         <if test="req.userType != null and req.userType == 'normal'">
-            and p.buil_org_code = #{req.userValue}
+            and p.build_org_code = #{req.userValue}
         </if>
         <if test="req.userType != null and req.userType == 'org'">
-            and (p.buil_org_code = #{req.userValue} or
+            and (p.build_org_code = #{req.userValue} or
             (p.stage = 10000 and p.status = 10003 and p.super_org_code = #{req.userValue}))
         </if>
         <if test="req.userType != null and req.userType == 'region'">
diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/projectCollection/ProjectCollection2Test.java b/pmapi/src/test/java/com/ningdatech/pmapi/projectCollection/ProjectCollection2Test.java
index 86de2c0..a0cbe9b 100644
--- a/pmapi/src/test/java/com/ningdatech/pmapi/projectCollection/ProjectCollection2Test.java
+++ b/pmapi/src/test/java/com/ningdatech/pmapi/projectCollection/ProjectCollection2Test.java
@@ -132,7 +132,7 @@ public class ProjectCollection2Test extends AppTests {
     @Test
     public void test2(){
         //恢复误删
-        String baseProjId = "33110000020210100017";
+        String baseProjId = "33110000020220400117";
 
         baseinfoService.update(Wrappers.lambdaUpdate(GovBizProjectBaseinfo.class)
                 .eq(GovBizProjectBaseinfo::getBaseProjId,baseProjId)