From 627833d14d3377d01f7a3dd318560d7dcedb7df1 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 20 Apr 2023 09:29:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92=E5=BA=93?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=8B=E9=A1=B9=E6=89=B9=E5=A4=8D=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java | 1 + .../com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java | 3 +++ 2 files changed, 4 insertions(+) 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 5bf8d96..d9018aa 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 @@ -121,6 +121,7 @@ public class AnnualPlanLibManage { item.setDeclaredAmount(w.getDeclareAmount()); item.setBuildOrg(w.getBuildOrgName()); item.setCreateOn(w.getCreateOn()); + item.setApprovalAmount(w.getApprovalAmount()); item.setIsStartDeclaredProject(!IN_THE_ANNUAL_PLAN.eq(w.getStatus())); result.getRecords().add(item); }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java index a70b985..867c098 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java @@ -29,6 +29,9 @@ public class AnnualPlanListItemVO { @ApiModelProperty("申报金额") private BigDecimal declaredAmount; + @ApiModelProperty("立项批复金额") + private BigDecimal approvalAmount; + @ApiModelProperty("预算年度") private Integer projectYear;