From a078fdefab6e57311a72a4de131c3469e0fcd41d Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 18 Sep 2023 14:57:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=20=E5=88=9D=E9=AA=8C=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectdeclared/manage/ConstructionManage.java | 4 ++++ .../pmapi/projectdeclared/model/dto/PreInsSaveDTO.java | 6 ++++++ .../projectdeclared/model/dto/PurchaseSaveDTO.java | 3 +++ .../projectdeclared/model/entity/ProjectDraft.java | 4 ++-- .../pmapi/projectdeclared/model/entity/Purchase.java | 5 +++++ .../pmapi/projectdeclared/model/vo/PreInsVO.java | 6 ++++++ .../pmapi/projectlib/manage/AnnualPlanLibManage.java | 3 +++ .../pmapi/projectlib/model/dto/ProjectDTO.java | 4 ++-- .../pmapi/projectlib/model/entity/Project.java | 18 ++++++++++++++---- .../pmapi/projectlib/model/req/ProjectApprovedReq.java | 15 +++++++++++---- .../pmapi/projectlib/model/vo/ProjectDetailVO.java | 14 ++++++++++++-- 11 files changed, 68 insertions(+), 14 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java index 1a5a3f3..d282a9a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java +++ b/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 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 "填写成功"; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PreInsSaveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PreInsSaveDTO.java index 289179f..158b0dc 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PreInsSaveDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PreInsSaveDTO.java @@ -33,4 +33,10 @@ public class PreInsSaveDTO { @ApiModelProperty("初验验收人员") private List acceptancePersons; + + @ApiModelProperty("是否完成日志数据归集") + private Boolean isCompletedLogCollection; + + @ApiModelProperty("实际成效指标") + private String actualPerformanceIndicators; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java index e879e68..07f7152 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java +++ b/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; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java index f0df7d3..3270314 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java +++ b/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; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/Purchase.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/Purchase.java index 4de2318..2b29c5e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/Purchase.java +++ b/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; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PreInsVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PreInsVO.java index dee5f45..824a9da 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PreInsVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PreInsVO.java @@ -31,4 +31,10 @@ public class PreInsVO { @ApiModelProperty("初验验收人员") private List acceptancePersons; + + @ApiModelProperty("是否完成日志数据归集") + private Boolean isCompletedLogCollection; + + @ApiModelProperty("实际成效指标") + private String actualPerformanceIndicators; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java index 5ea60b7..66797b9 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java +++ b/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()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java index c7072a5..63a1a85 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java +++ b/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; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java index 04f96bd..c9d2d65 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java +++ b/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; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectApprovedReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectApprovedReq.java index 04c8ad4..6915840 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectApprovedReq.java +++ b/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("批复时间") diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java index 3550788..fcc3ca7 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java +++ b/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; }