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 <= #{req.approveAmountMax} - and p.buil_org_code = #{req.userValue} + and p.build_org_code = #{req.userValue} - 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})) 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)