From da30faa382a2f16c7c4742bc73884e06d0309b9f Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Wed, 13 Apr 2022 09:21:23 +0800
Subject: [PATCH] 111

---
 .../application/command/prediction/SaveYBKZMoneySvrImpl.java | 5 +++--
 .../infrastructure/dataobject/po/ExpenseCardNumberPo.java    | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/prediction/SaveYBKZMoneySvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/prediction/SaveYBKZMoneySvrImpl.java
index 4862b628b..1bfb44b63 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/prediction/SaveYBKZMoneySvrImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/prediction/SaveYBKZMoneySvrImpl.java
@@ -384,7 +384,8 @@ public class SaveYBKZMoneySvrImpl implements SaveYBKZMoneySvr{
                 businessProjectInputModel.setProjectCode(expenseCardNumberPos.get(0).getNumber());
                 businessProjectInputModel.setProjectName(projectPlanBookPo.getProjectName());
                 //鐜板湪琛ㄥ崟娌℃湁缁忚垂鍗℃潵婧愶紝鏁呮棤娉曠‘璁ゃ€傚緟纭
-                businessProjectInputModel.setFundCode("Z0001");
+                //businessProjectInputModel.setFundCode("Z0001");
+                businessProjectInputModel.setFundCode(expenseCardNumberPos.get(0).getFunCode());
                 businessProjectInputModel.setTemplateCode(budgetInfoPos.get(0).getModel());
                 businessProjectInputModel.setFirstChargeNo(projectPlanBookPo.getProjectLeaderCode());
                businessProjectInputModel.setLeaderPersonNo(projectPlanBookPo.getProjectLeaderCode());
@@ -830,7 +831,7 @@ public class SaveYBKZMoneySvrImpl implements SaveYBKZMoneySvr{
                 "鏄�",
                 "椤圭洰鎷ㄦ",
                 //鐜板湪琛ㄥ崟娌℃湁缁忚垂鍗℃潵婧愶紝鏁呮棤娉曠‘璁ゃ€傚緟纭
-                "Z0001",
+                expenseCardNumberPos.get(0).getFunCode(),
                 expenseCardNumberPos.get(0).getNumber(),
                 Integer.toString(projectPlanBookPo.getYear()),
                 "0",
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/ExpenseCardNumberPo.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/ExpenseCardNumberPo.java
index 6946aa31b..b73e0e9b8 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/ExpenseCardNumberPo.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/ExpenseCardNumberPo.java
@@ -27,4 +27,9 @@ public class ExpenseCardNumberPo extends BaseDataObject{
     @TableField("number")
     @ApiModelProperty("閽�")
     private String number;
+
+    @TableField("funCode")
+    @ApiModelProperty("缁忚垂鍗″彿")
+    private String funCode;
+
 }
-- 
GitLab