From d0dd418b175901a4bca94c393e0edab3ceb08348 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 29 May 2023 15:57:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E5=A4=8D=E9=87=91=E9=A2=9D=E5=92=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java | 2 ++ .../ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java index f8e5f2a..91fc705 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java @@ -91,6 +91,8 @@ public class PurchaseManage { item.setProcessStatus(w.getProcessStatus()); item.setInstCode(w.getInstCode()); item.setIsHigherSuperOrg(w.getIsHigherSuperOrg()); + item.setApprovedAmount(w.getApprovalAmount()); + item.setApprovalDate(w.getApprovalDate()); return item; }); return PageVo.of(records, total); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java index 08a6959..f452488 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java @@ -13,6 +13,7 @@ import lombok.Data; import lombok.experimental.Tolerate; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Objects; import java.util.Optional; @@ -46,6 +47,9 @@ public class ProjectLibListItemVO { @ApiModelProperty("批复金额") private BigDecimal approvedAmount; + @ApiModelProperty("立项批复时间") + private LocalDate approvalDate; + @ApiModelProperty("项目类型") private Integer projectType;