From 5f265641217e0a2b5b8160233487e63ff8cfaf39 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 07 九月 2023 14:14:35 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index a708d1e..fcf79de 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -1087,11 +1087,14 @@
String fyxm = "";
fyxm += f.getItemname() == null ? "" : f.getItemname();
fyxm += f.getAmount() + "鍏�";
-// fyxm += "(";
-// fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
-// fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
-// fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
-// fyxm += ")";
+ //濡傛灉鏄尰鐤楁垚鏈紝鍒欐妸閾惰鍗″姞涓婃瘡鏉℃槑缁嗙殑鍚庨潰
+ if (serviceFund.getApplytype().equals("3")) {
+ fyxm += "(";
+ fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
+ fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
+ fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
+ fyxm += ")";
+ }
map.put("FYXM", fyxm);
newList.add(map);
}
@@ -1104,7 +1107,8 @@
// dataMap.put("JEXS", serviceFund.getAmountrequested());
// dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "鏁�");
//澶囨敞閲屾斁鐨勬槸缁忓姙浜虹殑閾惰鍗′俊鎭�
- dataMap.put("BXBZ", infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + " " + infoByUserNo.getBankcardno());
+
+ dataMap.put("BXBZ", serviceFund.getApplytype().equals("3") ? "" : infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + " " + infoByUserNo.getBankcardno());
dataMap.put("YZ", serviceFund.getPresident() == null ? "" : serviceFund.getPresident());
dataMap.put("CWFYZ", serviceFund.getFinvicepresident() == null ? "" : serviceFund.getFinvicepresident());
dataMap.put("YWFYZ", serviceFund.getBusvicepresident() == null ? "" : serviceFund.getBusvicepresident());
--
Gitblit v1.9.3