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 } }