From 0dd78c3bf8a3655ab749d2cd6e533e2d3dbb4150 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 7 Jan 2026 19:45:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A9=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BB=84=E5=AE=A1=E6=A0=B8=E5=8D=A1=E7=89=87=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8E=E4=B8=BB=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=90=8C=E7=9A=84?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=98=B6=E6=AE=B5=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 后端添加审核人信息(设计负责人名称)到子任务组数据 2. 前端添加getProcessStageForReview函数支持子任务组 3. 子任务组现在显示'设计负责人:xxx审核'标签 --- .../designhub/service/TaskItemService.java | 14 ++++++++++ frontend/src/views/TaskHall.vue | 26 ++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/com/designhub/service/TaskItemService.java b/backend/src/main/java/com/designhub/service/TaskItemService.java index 58771f5..d3470d2 100644 --- a/backend/src/main/java/com/designhub/service/TaskItemService.java +++ b/backend/src/main/java/com/designhub/service/TaskItemService.java @@ -1107,6 +1107,20 @@ public class TaskItemService { } } + // 添加审核人信息(目标部门负责人) + Long targetDeptId = getTargetDeptIdFromTaskType(item.getTaskTypeId()); + if (targetDeptId != null) { + com.designhub.entity.Department targetDept = departmentMapper.selectById(targetDeptId); + if (targetDept != null && targetDept.getLeaderId() != null) { + com.designhub.entity.User leader = userMapper.selectById(targetDept.getLeaderId()); + if (leader != null) { + groupInfo.put("currentApproverName", leader.getRealName()); + groupInfo.put("currentApproverRole", "receiving_leader"); + groupInfo.put("approvalStatus", "pending_receiving_approval"); + } + } + } + // 计算子任务组总积分 groupInfo.put("totalScore", item.getTotalScore() != null ? item.getTotalScore() : 0); diff --git a/frontend/src/views/TaskHall.vue b/frontend/src/views/TaskHall.vue index 5980169..c6a2927 100644 --- a/frontend/src/views/TaskHall.vue +++ b/frontend/src/views/TaskHall.vue @@ -543,12 +543,12 @@ - -
+ +
- {{ getProcessStage(task) }} + {{ getProcessStageForReview(task) }}
@@ -2626,6 +2626,22 @@ const getProcessStage = (task: TaskOrSubTask): string => { return '' } +/** + * 获取待审核页面的流程阶段(支持子任务组) + */ +const getProcessStageForReview = (task: any): string => { + // 子任务组:使用后端返回的审核人信息 + if (task._itemType === 'taskGroup') { + if (task.currentApproverName) { + return `设计负责人:${task.currentApproverName}审核` + } + return '设计负责人审核' + } + + // 主任务:使用原有逻辑 + return getProcessStage(task) +} + // 判断是否为新发布任务(1小时内) const isNewTask = (task: TaskOrSubTask) => { if (!task.createTime) return false @@ -3888,6 +3904,10 @@ const loadReviewTasks = async () => { publisherId: group.publisherId, publisherName: group.publisherName, publisherDeptName: group.publisherDeptName, + // 审核人信息(流程阶段显示) + currentApproverName: group.currentApproverName, + currentApproverRole: group.currentApproverRole, + approvalStatus: group.approvalStatus, // 前置任务的素材下载链接 prevDownloadUrls: group.prevDownloadUrls || [], // 标记类型