采购 初验 字段新增

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java

@@ -402,6 +402,8 @@ public class ConstructionManage {
         PreInsVO vo = new PreInsVO();
         vo.setProjectId(projectId);
         vo.setPreliminaryInspectionMaterials(project.getPreliminaryInspectionMaterials());
+        vo.setIsCompletedLogCollection(project.getIsCompletedLogCollection());
+        vo.setActualPerformanceIndicators(project.getActualPerformanceIndicators());
         LambdaQueryWrapper<PreInsAcceptancePerson> query = Wrappers.lambdaQuery(PreInsAcceptancePerson.class)
                 .eq(PreInsAcceptancePerson::getProjectId, projectId)
                 .orderByAsc(PreInsAcceptancePerson::getCreateOn);
@@ -468,6 +470,8 @@ public class ConstructionManage {
         }
         project.setUpdateOn(LocalDateTime.now());
         project.setPreliminaryInspectionMaterials(dto.getPreliminaryInspectionMaterials());
+        project.setIsCompletedLogCollection(dto.getIsCompletedLogCollection());
+        project.setActualPerformanceIndicators(dto.getActualPerformanceIndicators());
         projectService.updateById(project);
 
         return "填写成功";

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PreInsSaveDTO.java

@@ -33,4 +33,10 @@ public class PreInsSaveDTO {
 
     @ApiModelProperty("初验验收人员")
     private List<PreInsAcceptancePersonSaveDTO> acceptancePersons;
+
+    @ApiModelProperty("是否完成日志数据归集")
+    private Boolean isCompletedLogCollection;
+
+    @ApiModelProperty("实际成效指标")
+    private String actualPerformanceIndicators;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java

@@ -36,6 +36,9 @@ public class PurchaseSaveDTO {
         @ApiModelProperty("标段ID")
         private Long id;
 
+        @ApiModelProperty("标段名称")
+        private String bidName;
+
         @ApiModelProperty("供应商")
         private String supplier;
 

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java

@@ -131,8 +131,8 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("立项依据说明")
     private String baseBasisEstablish;
 
-    @ApiModelProperty("预算来源")
-    private String baseProjAmountOri;
+    @ApiModelProperty("预算来源说明")
+    private String baseBasisAmountOri;
 
     @ApiModelProperty("发改编码")
     private String developCode;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/Purchase.java

@@ -30,6 +30,9 @@ public class Purchase {
     @ApiModelProperty("id")
     private Long id;
 
+    @ApiModelProperty("标段名称")
+    private String bidName;
+
     @ApiModelProperty("项目ID")
     private Long projectId;
 
@@ -75,4 +78,6 @@ public class Purchase {
     @ApiModelProperty("中标通知书")
     private String acceptanceLetter;
 
+    @ApiModelProperty("预算执行确认书编号")
+    private String budgetExecConfirmNo;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PreInsVO.java

@@ -31,4 +31,10 @@ public class PreInsVO {
 
     @ApiModelProperty("初验验收人员")
     private List<PreInsAcceptancePersonVO> acceptancePersons;
+
+    @ApiModelProperty("是否完成日志数据归集")
+    private Boolean isCompletedLogCollection;
+
+    @ApiModelProperty("实际成效指标")
+    private String actualPerformanceIndicators;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java

@@ -154,7 +154,10 @@ public class AnnualPlanLibManage {
         stateMachine.pass(project);
         //计划出 计划验收时间
         LocalDateTime planAcceptanceTime = getPlanAcceptanceTime(req);
+        //立项批复总投资
         project.setApprovalAmount(req.getApprovedAmount());
+        //立项批复预算
+        project.setApprovalBudget(req.getApprovalBudget());
         project.setApprovedFile(String.valueOf(req.getApprovedFileId()));
         project.setBuildCycle(String.valueOf(req.getBuildCycle()));
         project.setOriginBuildCycle(req.getBuildCycle());

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java

@@ -54,8 +54,8 @@ public class ProjectDTO implements Serializable {
     @ApiModelProperty("历年项目年度")
     private String baseHistorProjYear;
 
-    @ApiModelProperty("预算来源")
-    private String baseProjAmountOri;
+    @ApiModelProperty("预算来源说明")
+    private String baseBasisAmountOri;
 
     @ApiModelProperty("是否临时增补 0:否 1:是")
     private Integer isTemporaryAugment;

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java

@@ -56,8 +56,8 @@ public class Project implements Serializable {
     @ApiModelProperty("历年项目年度")
     private String baseHistorProjYear;
 
-    @ApiModelProperty("预算来源")
-    private String baseProjAmountOri;
+    @ApiModelProperty("预算来源说明")
+    private String baseBasisAmountOri;
 
     @ApiModelProperty("是否临时增补 0:否 1:是")
     @Compare("是否临时增补")
@@ -233,10 +233,14 @@ public class Project implements Serializable {
     @Compare("年度支付计划-其它资金")
     private BigDecimal annualPlanOtherAmount;
 
-    @ApiModelProperty("立项批复资金(万元)")
-    @Compare("立项批复资金")
+    @ApiModelProperty("立项批复总投资(万元)")
+    @Compare("立项批复总投资")
     private BigDecimal approvalAmount;
 
+    @ApiModelProperty("立项批复总预算(万元)")
+    @Compare("立项批复总预算")
+    private BigDecimal approvalBudget;
+
     @ApiModelProperty("年度计划添加时间")
     @Compare("年度计划添加时间")
     private LocalDateTime annualPlanAddTime;
@@ -529,4 +533,10 @@ public class Project implements Serializable {
 
     @ApiModelProperty("其他附件")
     private String baseProjOtherFile;
+
+    @ApiModelProperty("是否完成日志数据归集")
+    private Boolean isCompletedLogCollection;
+
+    @ApiModelProperty("实际成效指标")
+    private String actualPerformanceIndicators;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectApprovedReq.java

@@ -29,12 +29,19 @@ public class ProjectApprovedReq {
     @NotNull(message = "项目ID不能为空")
     private Long projectId;
 
-    @ApiModelProperty("批复金额")
-    @NotNull(message = "批复金额不能为空")
-    @DecimalMax(value = "999999999.99", message = "批复金额无效")
-    @DecimalMin(value = "0.01", message = "批复金额无效")
+    @ApiModelProperty("批复总投资")
+    @NotNull(message = "批复总投资不能为空")
+    @DecimalMax(value = "999999999.99", message = "批复总投资无效")
+    @DecimalMin(value = "0.01", message = "批复总投资无效")
     private BigDecimal approvedAmount;
 
+    @ApiModelProperty("批复总预算")
+    @NotNull(message = "批复总预算不能为空")
+    @DecimalMax(value = "999999999.99", message = "批复总预算无效")
+    @DecimalMin(value = "0.01", message = "批复总预算无效")
+    private BigDecimal approvalBudget;
+
+
     @NotNull(message = "批复时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("批复时间")

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java

@@ -63,8 +63,8 @@ public class ProjectDetailVO {
     @ApiModelProperty("'历年项目编码'")
     private String baseHistorProjId;
 
-    @ApiModelProperty("预算来源")
-    private String baseProjAmountOri;
+    @ApiModelProperty("预算来源说明")
+    private String baseBasisAmountOri;
 
     @ApiModelProperty("历年项目年度")
     private String baseHistorProjYear;
@@ -206,6 +206,10 @@ public class ProjectDetailVO {
     @ApiModelProperty("立项批复资金(万元)")
     private BigDecimal approvalAmount;
 
+    @ApiModelProperty("立项批复总预算(万元)")
+    @Compare("立项批复总预算")
+    private BigDecimal approvalBudget;
+
     private LocalDateTime annualPlanAddTime;
 
     @ApiModelProperty("核心业务-核心业务模块")
@@ -504,4 +508,10 @@ public class ProjectDetailVO {
 
     @ApiModelProperty("其他附件")
     private String baseProjOtherFile;
+
+    @ApiModelProperty("是否完成日志数据归集")
+    private Boolean isCompletedLogCollection;
+
+    @ApiModelProperty("实际成效指标")
+    private String actualPerformanceIndicators;
 }