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/ServiceDonatecompletioninfoController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index 0c1532c..e5f8163 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -3,12 +3,15 @@
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.enums.OrganEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
@@ -62,7 +65,7 @@
* 鏌ヨ鎹愮尞瀹屾垚鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛歿}", serviceDonatecompletioninfo);
@@ -86,7 +89,7 @@
* 瀵煎嚭鎹愮尞瀹屾垚鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞瀹屾垚鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:export')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
@@ -100,7 +103,7 @@
* 鑾峰彇鎹愮尞瀹屾垚璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰彇鏌愪竴鏉℃崘鐚畬鎴愪俊鎭�")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
log.info("閫氳繃id鑾峰彇鏌愪竴鏉℃崘鐚畬鎴愪俊鎭細{}", id);
@@ -111,7 +114,7 @@
* 鏂板鎹愮尞瀹屾垚
*/
@ApiOperation("鏂板鎹愮尞瀹屾垚")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit(interval = 5000)
@@ -127,7 +130,7 @@
// * 鏂板鎹愮尞瀹屾垚璇︽儏
// */
// @ApiOperation("鏂板鎹愮尞瀹屾垚璇︽儏")
-// //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
+// //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
// @Log(title = "鏂板鎹愮尞瀹屾垚璇︽儏", businessType = BusinessType.INSERT)
// @PostMapping
// @RepeatSubmit(interval = 5000)
@@ -148,7 +151,7 @@
@RepeatSubmit
@ApiOperation("鏂板鎴栦慨鏀规崘鐚畬鎴�")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdateDonatecompletioninfo")
public AjaxResult saveOrUpdateDonatecompletioninfo(@RequestBody List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList) {
@@ -172,7 +175,7 @@
*/
@RepeatSubmit
@ApiOperation("淇敼鎹愮尞瀹屾垚")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
@@ -190,7 +193,7 @@
* 鍒犻櫎鎹愮尞瀹屾垚
*/
@ApiOperation("鍒犻櫎鎹愮尞瀹屾垚")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:remove')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -220,18 +223,16 @@
String name = "浜轰綋鍣ㄥ畼鎹愮尞瀹屾垚缁撴灉鐧昏琛╛" + dataMap.get("XM") + "_" + 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) {
+ log.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