From 9b44e841586ce281e4e3e9d7296d74b29939418b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 22 五月 2024 10:53:17 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 3f4fe47..5963349 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
@@ -956,6 +956,7 @@
Map dataMap = new HashMap();
String dataYX = getDataYX(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
+ log.info("filePath鐨勫�间负:{}", filePath);
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
@@ -986,18 +987,19 @@
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
-
try {
out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
- e1.printStackTrace();
+ log.error("FileNotFoundException鎶ラ敊淇℃伅鏄細{}",e1.getMessage());
+// e1.printStackTrace();
}
try {
t.process(dataMap, out);
} catch (TemplateException e) {
- e.printStackTrace();
+ log.error("TemplateException鎶ラ敊淇¤嚜鏄細{}",e.getMessage());
+ e.getMessage();
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
@@ -1139,7 +1141,7 @@
dataMap.put("CWSH", serviceFund.getFinancechecher() == null ? "" : serviceFund.getFinancechecher());
dataMap.put("YYMMDD", time);
- dataMap.put("XM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
+ dataMap.put("XM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname().trim());
dataMap.put("GZRY", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
dataMap.put("ZZ", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());
--
Gitblit v1.9.3