From 54bcf7d8ae6300acce561a6ecbf8c80775181de0 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 11 Jun 2026 17:32:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(workreport):=20=E8=A7=A3=E5=86=B3=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=8A=A5=E8=A1=A8=E7=8A=B6=E6=80=81=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入 StatusActionTextResolver 服务用于解析状态动作名称
- 注入 statusActionTextResolver 依赖实例
- 修改异常抛出逻辑，将内部ActionCode转换为用户友好的中文提示
- 更新工作报表状态转换验证中的错误信息显示方式
- 修复拒绝状态下重新提交操作的错误信息国际化问题
---
 .../workreport/common/WorkReportCommonService.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/workreport/common/WorkReportCommonService.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/workreport/common/WorkReportCommonService.java
index ec2323f..1d8fa6b 100644
--- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/workreport/common/WorkReportCommonService.java
+++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/workreport/common/WorkReportCommonService.java
@@ -47,6 +47,7 @@ import com.njcn.rdms.module.project.dal.mysql.workreport.weekly.WeeklyReportAppr
 import com.njcn.rdms.module.project.dal.mysql.workreport.weekly.WeeklyReportMapper;
 import com.njcn.rdms.module.project.dal.mysql.workreport.weekly.WeeklyReportTravelSegmentMapper;
 import com.njcn.rdms.module.project.enums.ErrorCodeConstants;
+import com.njcn.rdms.module.project.service.status.StatusActionTextResolver;
 import com.njcn.rdms.module.system.api.dept.DeptApi;
 import com.njcn.rdms.module.system.api.dept.PostApi;
 import com.njcn.rdms.module.system.api.dept.dto.DeptRespDTO;
@@ -106,6 +107,8 @@ public class WorkReportCommonService {
     @Resource
     private ObjectStatusTransitionMapper objectStatusTransitionMapper;
     @Resource
+    private StatusActionTextResolver statusActionTextResolver;
+    @Resource
     private AdminUserApi adminUserApi;
     @Resource
     private DeptApi deptApi;
@@ -730,10 +733,13 @@ public class WorkReportCommonService {
         ObjectStatusTransitionDO transition = objectStatusTransitionMapper
                 .selectByObjectTypeAndFromStatusAndAction(WorkReportConstants.STATUS_OBJECT_TYPE, fromStatus, actionCode);
         if (transition == null) {
-            throw exception(ErrorCodeConstants.WORK_REPORT_STATUS_ACTION_NOT_ALLOWED, actionCode);
+            // TD-012：用户可见文案不外泄内部 code，翻成状态机中文动作名（见 docs/architecture/用户可见错误文案规范.html）
+            throw exception(ErrorCodeConstants.WORK_REPORT_STATUS_ACTION_NOT_ALLOWED,
+                    statusActionTextResolver.actionName(WorkReportConstants.STATUS_OBJECT_TYPE, actionCode));
         }
         if (Boolean.TRUE.equals(transition.getNeedReason()) && !StringUtils.hasText(reason)) {
-            throw exception(ErrorCodeConstants.WORK_REPORT_STATUS_ACTION_REASON_REQUIRED, actionCode);
+            throw exception(ErrorCodeConstants.WORK_REPORT_STATUS_ACTION_REASON_REQUIRED,
+                    statusActionTextResolver.actionName(WorkReportConstants.STATUS_OBJECT_TYPE, actionCode));
         }
         getStatusModel(transition.getToStatusCode());
         return transition;
@@ -775,7 +781,8 @@ public class WorkReportCommonService {
         if (WorkReportConstants.STATUS_REJECTED.equals(statusCode)) {
             return WorkReportConstants.ACTION_RESUBMIT;
         }
-        throw exception(ErrorCodeConstants.WORK_REPORT_STATUS_ACTION_NOT_ALLOWED, WorkReportConstants.ACTION_SUBMIT);
+        throw exception(ErrorCodeConstants.WORK_REPORT_STATUS_ACTION_NOT_ALLOWED,
+                statusActionTextResolver.actionName(WorkReportConstants.STATUS_OBJECT_TYPE, WorkReportConstants.ACTION_SUBMIT));
     }
 
     private void validateWeeklyDuplicate(Long reporterId, String periodKey, Long excludeId) {