Browse Source

modify:

1. 增加是否发布信创云图;
tags/24080901
WendyYang 3 months ago
parent
commit
005fdc246c
4 changed files with 12 additions and 2 deletions
  1. +3
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
  2. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Purchase.java
  3. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java
  4. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java

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

@@ -356,6 +356,7 @@ public class PurchaseManage {
purchase.setBidType(w.getBidType());
purchase.setPurchaseDate(w.getPurchaseDate());
purchase.setBidPayAmount(w.getBidPayAmount());
purchase.setPublishMhNotice(w.getPublishMhNotice());
if (purchase.getId() == null) {
purchase.setCreateBy(user.getUserIdStr());
}
@@ -364,7 +365,7 @@ public class PurchaseManage {
purchase.setAdaptStatus(TenderAdaptStatus.WITHOUT_ADAPT_INFO.getCode());
purchase.setStatus(TenderStatus.TO_BE_SUBMIT_PURCHASE_CONSTRUCTION_INFO.getCode());
purchase.setXcfhxApplyStatus(TenderXcfhxApplyStatus.TO_BE_SUBMIT_XCFHX_APPLY.getCode());
if (Boolean.TRUE.equals(mhPurchaseNoticeOpen)) {
if (Boolean.TRUE.equals(mhPurchaseNoticeOpen) && Boolean.TRUE.equals(w.getPublishMhNotice())) {
notices.add(buildPurchaseNotice(w, user));
}
return purchase;
@@ -373,7 +374,7 @@ public class PurchaseManage {
projectStateMachineUtil.pass(project);
projectService.updateById(project);
// 发布采购公告
if (Boolean.TRUE.equals(mhPurchaseNoticeOpen)) {
if (!notices.isEmpty()) {
mhApiClient.publishPurchaseNotice(notices);
}
}


+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Purchase.java View File

@@ -176,4 +176,7 @@ public class Purchase {
@ApiModelProperty("项目名称")
private String projectName;

@ApiModelProperty("是否发布信创云图")
private Boolean publishMhNotice;

}

+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java View File

@@ -70,6 +70,9 @@ public class SubmitPurchaseNoticeReq {
@NotBlank(message = "采购方式不能为空")
private String purchaseMethod;

@ApiModelProperty("是否发布信创云图")
public Boolean publishMhNotice;

@ApiModelProperty("采购范围:1 公开采购、2 非公开采购")
private Integer purchaseScope;



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

@@ -170,4 +170,7 @@ public class PurchaseVO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private LocalDate purchaseDate;

@ApiModelProperty("是否发布信创云图")
public Boolean publishMhNotice;

}

Loading…
Cancel
Save