标签 2边都可以设置

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;

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;

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;

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectMapper.xml

@@ -293,10 +293,10 @@
             and p.approval_amount <= #{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'">

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)