From 9e99e7e192c62c2274f8f5362b354cbf55c3d80f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 七月 2024 16:21:32 +0800
Subject: [PATCH] 变更
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 5963349..94f0d70 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
@@ -643,7 +643,11 @@
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
// dataMap.put("FYXM1", "鏀粯涓撳璐圭敤锛屽叾涓◣鍓嶉噾棰�" + serviceFund.getPretaxcost() + "鍏冿紝绋庡悗閲戦" + serviceFund.getTaxedcost() + "鍏冦��");
- dataMap.put("FYXM1", "浜轰綋鍣ㄥ畼鎹愮尞涓撳鍔冲姟璐�:" + serviceFund.getPretaxcost() + "鍏� (鍏朵腑绋庡悗璐圭敤鐢变腑蹇冩壙鎷呯◣璐�)銆�");
+ if (serviceFund.getApplytype().equals("1")) {
+ dataMap.put("FYXM1", "浜轰綋鍣ㄥ畼鎹愮尞涓撳鍔冲姟璐�:" + serviceFund.getPretaxcost() + "鍏� (鍏朵腑绋庡悗璐圭敤鐢变腑蹇冩壙鎷呯◣璐�)銆�");
+ } else if (serviceFund.getApplytype().equals("4")) {
+ dataMap.put("FYXM1", "鍔炲叕璐圭敤:" + serviceFund.getPretaxcost());
+ }
dataMap.put("FYXM2", "");
dataMap.put("FYXM3", "");
dataMap.put("JEXS", serviceFund.getPretaxcost());
@@ -991,14 +995,14 @@
out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
- log.error("FileNotFoundException鎶ラ敊淇℃伅鏄細{}",e1.getMessage());
+ log.error("FileNotFoundException鎶ラ敊淇℃伅鏄細{}", e1.getMessage());
// e1.printStackTrace();
}
try {
t.process(dataMap, out);
} catch (TemplateException e) {
- log.error("TemplateException鎶ラ敊淇¤嚜鏄細{}",e.getMessage());
+ log.error("TemplateException鎶ラ敊淇¤嚜鏄細{}", e.getMessage());
e.getMessage();
}
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.9.3