From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理:辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单:标签打印功能调整 3.人员:培训计划导入导出添加【培训大类】字段 4.业务管理:报检新增【物料属性】字段选择,其余页面添加【物料属性】查询条件以及数据回显

---
 cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
index cf573fa..56224d7 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
@@ -25,7 +25,7 @@
  * 浣滃簾鏂囦欢閿�榄傝褰� 鍓嶇鎺у埗鍣�
  * </p>
  *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
  * @since 2024-11-13 01:27:22
  */
 @Api(tags = "璁板綍鐨勬帶鍒�")
@@ -79,9 +79,10 @@
     @ApiOperation(value = "瀵煎叆浣滃簾鏂囦欢閿�姣佽褰�")
     @PostMapping("/exportInManageRecordCancel")
     public Result exportInManageRecordCancel(MultipartFile file){
-        return Result.success(manageRecordCancelService.exportInManageRecordCancel(file));
+        try {
+            return Result.success(manageRecordCancelService.exportInManageRecordCancel(file));
+        }catch (Exception e){
+            return Result.fail(e.getMessage());
+        }
     }
-
-
-
 }

--
Gitblit v1.9.3