From 3d6c6493888d76766c9321c8a6dd6ced1d5a111e Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 27 Jan 2026 21:16:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=AE=A1=E6=A0=B8=E5=A4=87=E6=B3=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=8D=E4=BC=A0=E9=80=92=E7=BB=99=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. TaskApprovalService: 在approvePrimaryTask中将审核备注保存到task.remark字段 2. TaskItem: 添加remark字段用于传递主任务备注信息 3. TaskItemController: 在enrichTaskItemsWithSubTasks中填充remark 4. TaskHall.vue: 在mapTaskItemToTask中映射remark字段 同时将190条历史审核备注从task_approval_log同步到task表 --- .../com/designhub/controller/TaskItemController.java | 2 ++ .../src/main/java/com/designhub/entity/TaskItem.java | 11 +++++++++++ .../com/designhub/service/TaskApprovalService.java | 4 ++++ frontend/src/types/components.d.ts | 1 + frontend/src/views/TaskHall.vue | 4 +++- 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/com/designhub/controller/TaskItemController.java b/backend/src/main/java/com/designhub/controller/TaskItemController.java index 21e7ac0..7ac68b3 100644 --- a/backend/src/main/java/com/designhub/controller/TaskItemController.java +++ b/backend/src/main/java/com/designhub/controller/TaskItemController.java @@ -192,6 +192,8 @@ public class TaskItemController { Task mainTask = taskMap.get(taskId); if (mainTask != null) { item.setIsPipeline(mainTask.getIsPipeline()); + // 🔥 传递主任务的备注信息给子任务（需求部门审核时填写的备注） + item.setRemark(mainTask.getRemark()); } // 填充同一主任务的所有子任务列表 diff --git a/backend/src/main/java/com/designhub/entity/TaskItem.java b/backend/src/main/java/com/designhub/entity/TaskItem.java index 47ba4ee..8881cb2 100644 --- a/backend/src/main/java/com/designhub/entity/TaskItem.java +++ b/backend/src/main/java/com/designhub/entity/TaskItem.java @@ -272,4 +272,15 @@ public class TaskItem implements Serializable { */ @TableField(exist = false) private String detailCompleterName; + + /** + * 主任务备注信息（非数据库字段，从主任务关联） + * 用于传递需求部门审核时填写的备注给后续节点 + */ + @TableField(exist = false) + private String remark; + + // Getter和Setter + public String getRemark() { return remark; } + public void setRemark(String remark) { this.remark = remark; } } diff --git a/backend/src/main/java/com/designhub/service/TaskApprovalService.java b/backend/src/main/java/com/designhub/service/TaskApprovalService.java index ce6a0cb..083dd33 100644 --- a/backend/src/main/java/com/designhub/service/TaskApprovalService.java +++ b/backend/src/main/java/com/designhub/service/TaskApprovalService.java @@ -79,6 +79,10 @@ public class TaskApprovalService { task.setDemandApprovalTime(LocalDateTime.now()); task.setCurrentApproverId(completerId); task.setCurrentApproverRole("detail_completer"); + // 🔥 保存审核备注到任务表，以便后续节点可以查看 + if (comment != null && !comment.trim().isEmpty()) { + task.setRemark(comment); + } taskMapper.updateById(task); // 4. 记录审核日志 diff --git a/frontend/src/types/components.d.ts b/frontend/src/types/components.d.ts index d738a2a..84ffa17 100644 --- a/frontend/src/types/components.d.ts +++ b/frontend/src/types/components.d.ts @@ -70,5 +70,6 @@ declare module 'vue' { RouterView: typeof import('vue-router')['RouterView'] TaskCard: typeof import('./../components/TaskCard.vue')['default'] TaskFilters: typeof import('./../components/TaskFilters.vue')['default'] + TaskFlowQueryDialog: typeof import('./../components/TaskFlowQueryDialog.vue')['default'] } } diff --git a/frontend/src/views/TaskHall.vue b/frontend/src/views/TaskHall.vue index 077d407..8bc21b7 100644 --- a/frontend/src/views/TaskHall.vue +++ b/frontend/src/views/TaskHall.vue @@ -4947,7 +4947,9 @@ const mapTaskItemToTask = (item: any) => { isPrimaryTask: item.isPrimaryTask, // 是否一级需求任务 primaryPublisherName: item.primaryPublisherName, // 一级需求发起人姓名 primaryPublisherDeptName: item.primaryPublisherDeptName, // 一级需求发起人部门名称 - detailCompleterName: item.detailCompleterName // 明细完善人姓名 + detailCompleterName: item.detailCompleterName, // 明细完善人姓名 + // 🔥 主任务备注信息（需求部门审核时填写） + remark: item.remark } }