Browse Source

补全初验终验材料

tags/24080901
WendyYang 10 months ago
parent
commit
ca9119bae8
3 changed files with 18 additions and 1 deletions
  1. +1
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java
  2. +1
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitFinallyInspectedReq.java
  3. +16
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java

+ 1
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java View File

@@ -648,6 +648,7 @@ public class ConstructionManage {
ProcessStartParamsVo processParam = new ProcessStartParamsVo();
processParam.setUser(defaultDeclaredProjectManage.buildUser(user.getUserId()));
processParam.setProcessUsers(Collections.emptyMap());
processParam.setFormData(Collections.emptyMap());
// 获取发起单位、发起单位主管单位、发起单位上级主管条线单位信息
Project project = projectService.getById(req.getProjectId());
Map<String, OrgInfoDTO> orgMap = defaultDeclaredProjectManage.buildOrgModelMap(user.getUserId(), project);


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

@@ -25,7 +25,7 @@ public class SubmitFinallyInspectedReq {
private Long bidId;

@ApiModelProperty("终验材料")
@NotBlank(message = "请提交验材料")
@NotBlank(message = "请提交验材料")
private String inspectionMaterials;

}

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

@@ -1,12 +1,15 @@
package com.hz.pm.api.projectdeclared.model.vo;

import com.hz.pm.api.projectdeclared.model.dto.PreInsAcceptancePersonSaveDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

/**
* @Classname Purchase
@@ -97,4 +100,17 @@ public class PurchaseVO {
@ApiModelProperty("信创报告")
private String xcfhxReportFiles;

@ApiModelProperty("初验材料")
@NotBlank(message = "请提交初验材料")
private String preliminaryInspectionMaterials;

@ApiModelProperty("初验 是否完成日志数据归集")
private Boolean isCompletedLogCollection;

@ApiModelProperty("初验 实际成效指标")
private String actualPerformanceIndicators;

@ApiModelProperty("终验申报材料")
private String finalInspectionMaterials;

}

Loading…
Cancel
Save