Browse Source

modify:

1. 增加标段状态查询;
2. 采购公告发布修改增加字段;
tags/24080901
WendyYang 3 months ago
parent
commit
8e5aa3506b
2 changed files with 3 additions and 4 deletions
  1. +2
    -3
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
  2. +1
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java

+ 2
- 3
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java View File

@@ -149,9 +149,8 @@ public class PurchaseManage {
query.orderByAsc(Project::getApprovalDate);
if (req.getBidStatus() != null) {
query.exists("select 1 from nd_purchase np where np.project_id = nd_project.id " +
"where np.status = {0} or np.adapt_status = {0} or np.self_test_status = {0} " +
"or np.test_valid_status = {0} or np.xcfhx_apply_status = {0}"
.replace("{0}", req.getBidStatus().toString()));
"and (np.status = {0} or np.adapt_status = {0} or np.self_test_status = {0} " +
" or np.test_valid_status = {0} or np.xcfhx_apply_status = {0})", req.getBidStatus());
}
Page<Project> page = projectService.page(req.page(), query);
if (page.getTotal() == 0) {


+ 1
- 1
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java View File

@@ -164,7 +164,7 @@ public class PurchaseVO {
private String projectName;

@ApiModelProperty("标项支付金额")
private BigDecimal bizPayAmount;
private BigDecimal bidPayAmount;

@ApiModelProperty("采购时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")


Loading…
Cancel
Save