@@ -648,6 +648,7 @@ public class ConstructionManage { | |||||
ProcessStartParamsVo processParam = new ProcessStartParamsVo(); | ProcessStartParamsVo processParam = new ProcessStartParamsVo(); | ||||
processParam.setUser(defaultDeclaredProjectManage.buildUser(user.getUserId())); | processParam.setUser(defaultDeclaredProjectManage.buildUser(user.getUserId())); | ||||
processParam.setProcessUsers(Collections.emptyMap()); | processParam.setProcessUsers(Collections.emptyMap()); | ||||
processParam.setFormData(Collections.emptyMap()); | |||||
// 获取发起单位、发起单位主管单位、发起单位上级主管条线单位信息 | // 获取发起单位、发起单位主管单位、发起单位上级主管条线单位信息 | ||||
Project project = projectService.getById(req.getProjectId()); | Project project = projectService.getById(req.getProjectId()); | ||||
Map<String, OrgInfoDTO> orgMap = defaultDeclaredProjectManage.buildOrgModelMap(user.getUserId(), project); | Map<String, OrgInfoDTO> orgMap = defaultDeclaredProjectManage.buildOrgModelMap(user.getUserId(), project); | ||||
@@ -25,7 +25,7 @@ public class SubmitFinallyInspectedReq { | |||||
private Long bidId; | private Long bidId; | ||||
@ApiModelProperty("终验材料") | @ApiModelProperty("终验材料") | ||||
@NotBlank(message = "请提交初验材料") | |||||
@NotBlank(message = "请提交终验材料") | |||||
private String inspectionMaterials; | private String inspectionMaterials; | ||||
} | } |
@@ -1,12 +1,15 @@ | |||||
package com.hz.pm.api.projectdeclared.model.vo; | 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.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
import lombok.Data; | import lombok.Data; | ||||
import javax.validation.constraints.NotBlank; | |||||
import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
import java.util.List; | |||||
/** | /** | ||||
* @Classname Purchase | * @Classname Purchase | ||||
@@ -97,4 +100,17 @@ public class PurchaseVO { | |||||
@ApiModelProperty("信创报告") | @ApiModelProperty("信创报告") | ||||
private String xcfhxReportFiles; | private String xcfhxReportFiles; | ||||
@ApiModelProperty("初验材料") | |||||
@NotBlank(message = "请提交初验材料") | |||||
private String preliminaryInspectionMaterials; | |||||
@ApiModelProperty("初验 是否完成日志数据归集") | |||||
private Boolean isCompletedLogCollection; | |||||
@ApiModelProperty("初验 实际成效指标") | |||||
private String actualPerformanceIndicators; | |||||
@ApiModelProperty("终验申报材料") | |||||
private String finalInspectionMaterials; | |||||
} | } |