From 72316a4264e2c190b36de8b8c90942d2ce6a05d2 Mon Sep 17 00:00:00 2001
From: yangk <yangk@mesnac.com>
Date: Wed, 3 Jun 2026 15:01:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor(erp):=20=E4=BC=98=E5=8C=96=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=B7=A5=E6=97=B6=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加了Slf4j日志注解用于错误记录
- 引入ServiceException替代RuntimeException进行异常处理
- 改进异常捕获和错误日志记录方式
- 修复了两个报表导出方法中的错误处理逻辑
- 统一了异常抛出的消息格式
- 提升了代码可维护性和错误追踪能力
---
 .../erp/controller/ErpTimesheetReportController.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpTimesheetReportController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpTimesheetReportController.java
index bcb402fd..ce916901 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpTimesheetReportController.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpTimesheetReportController.java
@@ -3,7 +3,9 @@ package org.dromara.oa.erp.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -45,6 +47,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @author Yangk
  * @date 2025-12-26
  */
+@Slf4j
 @Validated
 @RequiredArgsConstructor
 @RestController
@@ -140,8 +143,8 @@ public class ErpTimesheetReportController {
                     .registerWriteHandler(new ProjectRowHighlightStrategy(list))
                     .doWrite(list);
         } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("导出失败");
+            log.error("导出项目工时统计报表失败", e);
+            throw new ServiceException("导出失败");
         }
     }
 
@@ -237,8 +240,8 @@ public class ErpTimesheetReportController {
                     .doWrite(dataList);
 
         } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("导出失败");
+            log.error("导出项目人员工时统计报表失败", e);
+            throw new ServiceException("导出失败");
         }
     }