From 68b49efb4da346edb42a5d8ebb39af47207402bd Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 12 十月 2026 11:14:13 +0800
Subject: [PATCH] 修改了报销校验
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorpaymentController.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorpaymentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorpaymentController.java
index a0be903..28a08b5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorpaymentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorpaymentController.java
@@ -3,10 +3,12 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonorpayment;
import com.ruoyi.project.service.IServiceDonorpaymentService;
@@ -46,7 +48,6 @@
* 鏌ヨ璐圭敤鏀舵鍗曞垪琛�
*/
@ApiOperation("鏌ヨ璐圭敤鏀舵鍗曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:donorpayment:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonorpayment serviceDonorpayment) {
startPage();
@@ -58,7 +59,6 @@
* 瀵煎嚭璐圭敤鏀舵鍗曞垪琛�
*/
@ApiOperation("瀵煎嚭璐圭敤鏀舵鍗曞垪琛�")
- @PreAuthorize("@ss.hasPermi('system:donorpayment:export')")
@Log(title = "璐圭敤鏀舵鍗�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonorpayment serviceDonorpayment) {
@@ -71,7 +71,6 @@
* 鑾峰彇璐圭敤鏀舵鍗曡缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇璐圭敤鏀舵鍗曡缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:donorpayment:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonorpaymentService.getById(id));
@@ -81,7 +80,6 @@
* 鏂板璐圭敤鏀舵鍗�
*/
@ApiOperation("鏂板璐圭敤鏀舵鍗�")
- @PreAuthorize("@ss.hasPermi('system:donorpayment:add')")
@Log(title = "璐圭敤鏀舵鍗�", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
@@ -94,7 +92,6 @@
* 淇敼璐圭敤鏀舵鍗�
*/
@ApiOperation("淇敼璐圭敤鏀舵鍗�")
- @PreAuthorize("@ss.hasPermi('system:donorpayment:edit')")
@Log(title = "璐圭敤鏀舵鍗�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -106,7 +103,7 @@
* 鍒犻櫎璐圭敤鏀舵鍗�
*/
@ApiOperation("鍒犻櫎璐圭敤鏀舵鍗�")
- @PreAuthorize("@ss.hasPermi('system:donorpayment:remove')")
+ // @PreAuthorize("@ss.hasPermi('system:donorpayment:remove')")
@Log(title = "璐圭敤鏀舵鍗�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -127,27 +124,25 @@
configuration.setDirectoryForTemplateLoading(new File(filePath));
Template t = null;
try {
- t = configuration.getTemplate("娴欐睙鐪丱PO鏀舵缁撶畻鍗�.ftl");
+// t = configuration.getTemplate("娴欐睙鐪丱PO鏀舵缁撶畻鍗�.ftl");
+ t = configuration.getTemplate("娴欐睙鐪佹帴鏀跺櫒瀹樼粨绠楄〃.ftl");
} catch (IOException e) {
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "娴欐睙鐪丱PO鏀舵缁撶畻鍗昣"+ newTime;
+ String name = "娴欐睙鐪佹帴鏀跺櫒瀹樼粨绠楄〃_"+ newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
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();
+ if (t == null) {
+ throw new ServiceException("妯℃澘鍔犺浇澶辫触锛岃妫�鏌ユā鏉挎枃浠舵槸鍚﹀瓨鍦�", HttpStatus.NO_CONTENT);
}
- try {
+ // Writer 蹇呴』鍏抽棴/鍒锋柊锛欱ufferedWriter 甯︾紦鍐诧紝涓嶅叧闂細閫犳垚鏂囦欢鍙ユ焺娉勬紡涓斿唴瀹瑰彲鑳戒笉瀹屾暣
+ try (Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"))) {
t.process(dataMap, out);
- } catch (TemplateException e) {
- e.printStackTrace();
+ } catch (TemplateException | IOException e) {
+ logger.error("鐢熸垚妯℃澘鏂囨。澶辫触, name={}", name, e);
+ throw new ServiceException("鐢熸垚鏂囨。澶辫触", HttpStatus.ERROR);
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
--
Gitblit v1.9.3