diff --git a/backend/src/main/java/com/designhub/service/TaskItemService.java b/backend/src/main/java/com/designhub/service/TaskItemService.java index 58862e4..81d5a3c 100644 --- a/backend/src/main/java/com/designhub/service/TaskItemService.java +++ b/backend/src/main/java/com/designhub/service/TaskItemService.java @@ -1332,16 +1332,6 @@ public class TaskItemService { // 使用子任务自己的typeDetails(子任务创建时已经保存了明细) groupInfo.put("typeDetails", item.getTypeDetails()); - // 发起人信息 - groupInfo.put("publisherId", mainTask.getPublisherId()); - if (mainTask.getPublisherId() != null) { - com.designhub.entity.User publisher = userMapper.selectById(mainTask.getPublisherId()); - if (publisher != null) { - groupInfo.put("publisherName", publisher.getRealName()); - groupInfo.put("publisherDeptName", publisher.getDeptName()); - } - } - // 一级需求部门发起人信息(对于一级需求部门任务) groupInfo.put("primaryPublisherId", mainTask.getPrimaryPublisherId()); groupInfo.put("primaryPublisherDeptId", mainTask.getPrimaryPublisherDeptId()); @@ -1361,6 +1351,37 @@ public class TaskItemService { // 是否是一级需求部门任务 groupInfo.put("isPrimaryTask", mainTask.getIsPrimaryTask()); + // 明细完善人信息(需求部门成员) + groupInfo.put("detailCompleterId", mainTask.getDetailCompleterId()); + if (mainTask.getDetailCompleterId() != null) { + com.designhub.entity.User detailCompleter = userMapper.selectById(mainTask.getDetailCompleterId()); + if (detailCompleter != null) { + groupInfo.put("detailCompleterName", detailCompleter.getRealName()); + } + } + + // 发起人信息:对于一级需求任务,发起人显示为明细完善人;否则显示原始发起人 + if (mainTask.getIsPrimaryTask() != null && mainTask.getIsPrimaryTask() == 1 + && mainTask.getDetailCompleterId() != null) { + // 一级需求任务:发起人 = 明细完善人 + groupInfo.put("publisherId", mainTask.getDetailCompleterId()); + com.designhub.entity.User detailCompleter = userMapper.selectById(mainTask.getDetailCompleterId()); + if (detailCompleter != null) { + groupInfo.put("publisherName", detailCompleter.getRealName()); + groupInfo.put("publisherDeptName", detailCompleter.getDeptName()); + } + } else { + // 普通任务:发起人 = 原始发起人 + groupInfo.put("publisherId", mainTask.getPublisherId()); + if (mainTask.getPublisherId() != null) { + com.designhub.entity.User publisher = userMapper.selectById(mainTask.getPublisherId()); + if (publisher != null) { + groupInfo.put("publisherName", publisher.getRealName()); + groupInfo.put("publisherDeptName", publisher.getDeptName()); + } + } + } + // 主任务的任务类型信息 groupInfo.put("taskTypeId", mainTask.getTaskTypeId()); // 使用taskSubType显示一级分类(新品/优化/改图等) diff --git a/frontend/src/views/TaskHall.vue b/frontend/src/views/TaskHall.vue index 5c2e9d6..2224a2d 100644 --- a/frontend/src/views/TaskHall.vue +++ b/frontend/src/views/TaskHall.vue @@ -5043,6 +5043,9 @@ const loadReviewTasks = async (newFilters?: any) => { primaryPublisherName: group.primaryPublisherName, primaryPublisherDeptId: group.primaryPublisherDeptId, primaryPublisherDeptName: group.primaryPublisherDeptName, + // 明细完善人信息 + detailCompleterId: group.detailCompleterId, + detailCompleterName: group.detailCompleterName, // 审核人信息(流程阶段显示) currentApproverName: group.currentApproverName, currentApproverRole: group.currentApproverRole,