From ca9119bae8cc40411f760d32118d39775e4b150c Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 26 Feb 2024 17:51:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=88=9D=E9=AA=8C=E7=BB=88?= =?UTF-8?q?=E9=AA=8C=E6=9D=90=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/projectdeclared/manage/ConstructionManage.java | 1 + .../model/req/SubmitFinallyInspectedReq.java | 2 +- .../hz/pm/api/projectdeclared/model/vo/PurchaseVO.java | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java index 72883e7..c2e4070 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java @@ -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 orgMap = defaultDeclaredProjectManage.buildOrgModelMap(user.getUserId(), project); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitFinallyInspectedReq.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitFinallyInspectedReq.java index 00ed899..5d3b416 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitFinallyInspectedReq.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitFinallyInspectedReq.java @@ -25,7 +25,7 @@ public class SubmitFinallyInspectedReq { private Long bidId; @ApiModelProperty("终验材料") - @NotBlank(message = "请提交初验材料") + @NotBlank(message = "请提交终验材料") private String inspectionMaterials; } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java index 0294c64..902cc52 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java @@ -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; + }