From 31b00e51adcb4005c8e0bced960c5f7f3033f0f4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 八月 2023 10:30:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/resources/template/办公费用申请单.ftl | 6 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 23 +++++++++++++++++------
2 files changed, 20 insertions(+), 9 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 378b6e5..288f118 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
@@ -76,6 +76,9 @@
@Autowired
private IServiceFundSharedService fundServiceShare;
+ @Autowired
+ private IServiceExternalpersonService externalpersonService;
+
public ServiceFundController() {
configuration = new Configuration();
@@ -1007,6 +1010,10 @@
if (serviceFund == null) {
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
}
+ ServiceExternalperson infoByUserNo = null;
+ if (StringUtils.isNotBlank(serviceFund.getUserno())) {
+ infoByUserNo = externalpersonService.getInfoByUserNo(serviceFund.getUserno());
+ }
List<ServiceFunddetail> fd = serviceFunddetailService.getAllDetailsByFDIDHZ(id);
if (fd == null) {
@@ -1035,11 +1042,11 @@
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 += ")";
+// 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);
}
@@ -1051,7 +1058,8 @@
dataMap.put("JEDS", convert(serviceFund.getPretaxcost()) + "鏁�");
// dataMap.put("JEXS", serviceFund.getAmountrequested());
// dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "鏁�");
- dataMap.put("BXBZ", serviceFund.getRemark() == null ? "" : serviceFund.getRemark());
+ //澶囨敞閲屾斁鐨勬槸缁忓姙浜虹殑閾惰鍗′俊鎭�
+ dataMap.put("BXBZ", 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());
@@ -1087,6 +1095,9 @@
dataMap.put("list", newsList);
dataMap.put("BYHJ", hj);
+ dataMap.put("BGSZR2", serviceFund.getOfficedirector() == null ? "" : serviceFund.getOfficedirector());
+ dataMap.put("CWBZR2", serviceFund.getFinancedirector() == null ? "" : serviceFund.getFinancedirector());
+ dataMap.put("CWSH2", serviceFund.getFinancechecher() == null ? "" : serviceFund.getFinancechecher());
}
diff --git "a/ruoyi-admin/src/main/resources/template/\345\212\236\345\205\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl" "b/ruoyi-admin/src/main/resources/template/\345\212\236\345\205\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl"
index 8e2ba62..02c5e9d 100644
--- "a/ruoyi-admin/src/main/resources/template/\345\212\236\345\205\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl"
+++ "b/ruoyi-admin/src/main/resources/template/\345\212\236\345\205\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl"
@@ -2412,7 +2412,7 @@
<w:color w:val="000000"/>
<w:szCs w:val="21"/>
</w:rPr>
- <w:t>鍔炲叕瀹や富浠伙細</w:t>
+ <w:t>鍔炲叕瀹や富浠伙細${BGSZR2}</w:t>
</w:r>
<w:r>
<w:rPr>
@@ -2443,7 +2443,7 @@
<w:color w:val="000000"/>
<w:szCs w:val="21"/>
</w:rPr>
- <w:t xml:space="preserve"> 璐㈠姟閮ㄤ富浠伙細</w:t>
+ <w:t xml:space="preserve"> 璐㈠姟閮ㄤ富浠伙細${CWBZR2}</w:t>
</w:r>
<w:r>
<w:rPr>
@@ -2474,7 +2474,7 @@
<w:color w:val="000000"/>
<w:szCs w:val="21"/>
</w:rPr>
- <w:t xml:space="preserve"> 璐㈠姟瀹℃牳锛� </w:t>
+ <w:t xml:space="preserve"> 璐㈠姟瀹℃牳锛�${CWSH2} </w:t>
</w:r>
</w:p>
</w:tc>
--
Gitblit v1.9.3