From 51f24810cf532e175a4b856481b862491687c5af Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 11 Aug 2023 11:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E9=87=91=E9=A2=9D=20?=
 =?UTF-8?q?=E6=89=B9=E5=A4=8D=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java   | 2 ++
 .../ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
index 046829b..ddf7ba1 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
@@ -212,6 +212,8 @@ public class ProjectLibManage {
                     && w.getSuperOrgCode().equals(finalUser.getEmpPosUnitCode())) {
                 item.setCanPreDeclared(Boolean.TRUE);
             }
+            item.setApprovedAmount(w.getApprovalAmount());
+            item.setAnnualPlanAmount(w.getAnnualPlanAmount());
             item.setPrePlanProjectId(w.getPrePlanProjectId());
             setTag(item,finalTagMap,finalTagNameMap);
             return item;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java
index 67d0942..8fae0d3 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java
@@ -99,6 +99,7 @@ public class ProjectRenewalFundManage {
         vo.setStage(project.getStage());
         vo.setStatus(project.getStatus());
         vo.setBuildOrgName(project.getBuildOrgName());
+        vo.setAnnualPaymentAmount(project.getAnnualPlanAmount());
         return vo;
     }