modify:

1. 增加标段状态查询；
2. 采购公告发布修改增加字段；

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java

@@ -147,6 +147,12 @@ public class PurchaseManage {
         query.eq(Project::getStage, ProjectStatus.PROJECT_APPROVED.getCode());
         query.eq(Project::getNewest, Boolean.TRUE);
         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()));
+        }
         Page<Project> page = projectService.page(req.page(), query);
         if (page.getTotal() == 0) {
             return PageVo.empty();
@@ -349,6 +355,8 @@ public class PurchaseManage {
             purchase.setPurchaseUnitId(w.getPurchaseUnitId());
             purchase.setPurchaseContact(w.getPurchaseContact());
             purchase.setBidType(w.getBidType());
+            purchase.setPurchaseDate(w.getPurchaseDate());
+            purchase.setBidPayAmount(w.getBidPayAmount());
             if (purchase.getId() == null) {
                 purchase.setCreateBy(user.getUserIdStr());
             }

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Purchase.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -54,7 +54,7 @@ public class Purchase {
     @ApiModelProperty("供应商社会信用代码")
     private String supplierSocialCreditCode;
 
-    @ApiModelProperty("采购方式 1公开招标 2自行采购")
+    @ApiModelProperty("采购范围：1 公开采购、2 非公开采购、3 购买服务")
     private String purchaseMethod;
 
     @ApiModelProperty("成交金额")
@@ -99,9 +99,15 @@ public class Purchase {
     @ApiModelProperty("投标截止时间")
     private LocalDateTime bidEndTime;
 
+    @ApiModelProperty("标项支付金额")
+    private BigDecimal bidPayAmount;
+
+    @ApiModelProperty("采购时间")
+    private LocalDate purchaseDate;
+
     private Integer status;
 
-    @ApiModelProperty("采购范围：1 公开采购、2 非公开采购")
+    @ApiModelProperty("采购范围：1 公开采购、2 非公开采购、3 购买服务")
     private Integer purchaseScope;
 
     @ApiModelProperty("采购单位")

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java

@@ -9,6 +9,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -43,11 +44,16 @@ public class SubmitPurchaseNoticeReq {
         private String bidName;
 
         @ApiModelProperty("标段预算")
-        @NotNull(message = "标段预算不能为空")
         private BigDecimal bidBudget;
 
+        @ApiModelProperty("标项支付金额")
+        private BigDecimal bidPayAmount;
+
+        @ApiModelProperty("采购时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+        private LocalDate purchaseDate;
+
         @ApiModelProperty("开标时间")
-        @NotNull(message = "开标时间不能为空")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
         private LocalDateTime bidStartTime;
 

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java

@@ -1,5 +1,6 @@
 package com.hz.pm.api.projectdeclared.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -7,6 +8,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -160,4 +162,12 @@ public class PurchaseVO {
 
     @ApiModelProperty("项目名称")
     private String projectName;
+
+    @ApiModelProperty("标项支付金额")
+    private BigDecimal bizPayAmount;
+
+    @ApiModelProperty("采购时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDate purchaseDate;
+
 }

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/req/ProjectListReq.java

@@ -124,4 +124,7 @@ public class ProjectListReq extends PagePo {
 
     private List<Long> declaredUnitIds;
 
+    @ApiModelProperty("标项状态")
+    private Integer bidStatus;
+
 }