From 7cdc66043ad8c484b8eb4597e281a5d8d33e4794 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 25 八月 2023 16:41:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 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 737e585..7bf6d64 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();
@@ -513,7 +516,11 @@
serviceFundflow.setFundtype(2);
serviceFundflow.setApplytype(serviceFund.getApplytype());
serviceFundflow.setFlowconclusion(CheckFlag);
- serviceFundflow.setFlowcontent(checkFundVO.getFlowcontent());
+ if (org.apache.commons.lang.StringUtils.isNotBlank(checkFundVO.getFlowcontent())) {
+ serviceFundflow.setFlowcontent(checkFundVO.getFlowcontent());
+ } else {
+ serviceFundflow.setFlowcontent(checkFundVO.getFlowconclusion() == 1 ? "閫氳繃" : "涓嶉�氳繃");
+ }
serviceFundflow.setFlowlevel(OriginalFlowLevel + 1);
serviceFundflowService.save(serviceFundflow);
serviceFundService.updateById(serviceFund);
@@ -973,12 +980,14 @@
Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
- t = configuration.getTemplate("鍖诲鎴愭湰璐圭敤鐢宠鍗�.ftl");
+// t = configuration.getTemplate("鍖诲鎴愭湰璐圭敤鐢宠鍗�.ftl");
+ t = configuration.getTemplate("鍔炲叕璐圭敤鐢宠鍗�.ftl");
} catch (IOException e) {
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "鍖诲鎴愭湰璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
+// String name = "鍖诲鎴愭湰璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
+ String name = "鍔炲叕璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
@@ -1005,6 +1014,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) {
@@ -1023,6 +1036,8 @@
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
+ dataMap.put("YWZ", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
+ dataMap.put("ZHUZANG", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());
for (ServiceFunddetail f : fd) {
seqno++;
@@ -1031,21 +1046,30 @@
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);
}
+ //鍚堝苟鍗曞厓鏍�
+ checkList(newList);
dataMap.put("items", newList);
dataMap.put("JEXS", serviceFund.getPretaxcost());
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());
+ dataMap.put("BGSZR", serviceFund.getOfficedirector() == null ? "" : serviceFund.getOfficedirector());
+ dataMap.put("CWBZR", serviceFund.getFinancedirector() == null ? "" : serviceFund.getFinancedirector());
+ dataMap.put("CWSH", serviceFund.getFinancechecher() == null ? "" : serviceFund.getFinancechecher());
dataMap.put("YYMMDD", time);
dataMap.put("XM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
@@ -1075,6 +1099,20 @@
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());
+
+ }
+
+ public List<Map<String, Object>> checkList(List<Map<String, Object>> list) {
+ String start = "<w:vMerge w:val='restart'/>";
+ String end = "<w:vMerge/>";
+ list.get(0).put("start", start);
+ for (int i = 1; i < list.size(); i++) {
+ list.get(i).put("end", end);
+ }
+ return list;
}
--
Gitblit v1.9.3