fix: 子任务卡片显示一级需求人和需求部门发起人
1. TaskItem 实体添加 isPrimaryTask、primaryPublisherName、primaryPublisherDeptName、detailCompleterName 字段 2. TaskItemMapper 所有查询SQL添加一级需求人相关字段的关联查询 3. 前端 mapTaskItemToTask 函数映射一级需求任务相关字段 4. 子任务卡片现在可以正确显示一级需求人和需求部门发起人
This commit is contained in:
parent
93da7aca22
commit
77175573c7
@ -248,4 +248,28 @@ public class TaskItem implements Serializable {
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Integer subTaskTotal;
|
||||
|
||||
/**
|
||||
* 是否一级需求任务(非数据库字段,从主任务关联)
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Integer isPrimaryTask;
|
||||
|
||||
/**
|
||||
* 一级需求发起人姓名(非数据库字段,从主任务关联)
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String primaryPublisherName;
|
||||
|
||||
/**
|
||||
* 一级需求发起人部门名称(非数据库字段,从主任务关联)
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String primaryPublisherDeptName;
|
||||
|
||||
/**
|
||||
* 明细完善人姓名(非数据库字段,从主任务关联)
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String detailCompleterName;
|
||||
}
|
||||
|
||||
@ -32,7 +32,11 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
" t.task_sub_type AS taskSubType, " +
|
||||
" t.attachment_url AS attachmentUrl, " +
|
||||
" t.preview_image AS previewImage, " +
|
||||
" t.is_primary_task AS isPrimaryTask, " +
|
||||
" u.real_name AS publisherName, " +
|
||||
" pp.real_name AS primaryPublisherName, " +
|
||||
" ppd.dept_name AS primaryPublisherDeptName, " +
|
||||
" dc.real_name AS detailCompleterName, " +
|
||||
" b.brand_name AS brandName, " +
|
||||
" c.category_name AS categoryName, " +
|
||||
" p.platform_name AS platformName, " +
|
||||
@ -41,6 +45,9 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
"FROM task_item ti " +
|
||||
"LEFT JOIN task t ON ti.task_id = t.id " +
|
||||
"LEFT JOIN sys_user u ON t.publisher_id = u.id " +
|
||||
"LEFT JOIN sys_user pp ON t.primary_publisher_id = pp.id " +
|
||||
"LEFT JOIN sys_dept ppd ON t.primary_publisher_dept_id = ppd.id " +
|
||||
"LEFT JOIN sys_user dc ON t.detail_completer_id = dc.id " +
|
||||
"LEFT JOIN brand b ON t.brand_id = b.id " +
|
||||
"LEFT JOIN category c ON t.category_id = c.id " +
|
||||
"LEFT JOIN platform p ON t.platform_id = p.id " +
|
||||
@ -74,7 +81,11 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
" t.task_sub_type AS taskSubType, " +
|
||||
" t.attachment_url AS attachmentUrl, " +
|
||||
" t.preview_image AS previewImage, " +
|
||||
" t.is_primary_task AS isPrimaryTask, " +
|
||||
" u.real_name AS publisherName, " +
|
||||
" pp.real_name AS primaryPublisherName, " +
|
||||
" ppd.dept_name AS primaryPublisherDeptName, " +
|
||||
" dc.real_name AS detailCompleterName, " +
|
||||
" b.brand_name AS brandName, " +
|
||||
" c.category_name AS categoryName, " +
|
||||
" p.platform_name AS platformName, " +
|
||||
@ -83,6 +94,9 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
"FROM task_item ti " +
|
||||
"LEFT JOIN task t ON ti.task_id = t.id " +
|
||||
"LEFT JOIN sys_user u ON t.publisher_id = u.id " +
|
||||
"LEFT JOIN sys_user pp ON t.primary_publisher_id = pp.id " +
|
||||
"LEFT JOIN sys_dept ppd ON t.primary_publisher_dept_id = ppd.id " +
|
||||
"LEFT JOIN sys_user dc ON t.detail_completer_id = dc.id " +
|
||||
"LEFT JOIN brand b ON t.brand_id = b.id " +
|
||||
"LEFT JOIN category c ON t.category_id = c.id " +
|
||||
"LEFT JOIN platform p ON t.platform_id = p.id " +
|
||||
@ -122,11 +136,15 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
" t.task_sub_type AS taskSubType, " +
|
||||
" t.attachment_url AS attachmentUrl, " +
|
||||
" t.preview_image AS previewImage, " +
|
||||
" t.is_primary_task AS isPrimaryTask, " +
|
||||
" b.brand_name AS brandName, " +
|
||||
" c.category_name AS categoryName, " +
|
||||
" p.platform_name AS platformName, " +
|
||||
" dt.type_name AS taskTypeName, " +
|
||||
" u.real_name AS publisherName, " +
|
||||
" pp.real_name AS primaryPublisherName, " +
|
||||
" ppd.dept_name AS primaryPublisherDeptName, " +
|
||||
" dc.real_name AS detailCompleterName, " +
|
||||
" r.real_name AS receiverName, " +
|
||||
" (SELECT COUNT(*) FROM task_item WHERE task_id = ti.task_id) AS totalItems " +
|
||||
"FROM task_item ti " +
|
||||
@ -136,6 +154,9 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
"LEFT JOIN platform p ON t.platform_id = p.id " +
|
||||
"LEFT JOIN task_type dt ON ti.task_type_id = dt.id " +
|
||||
"LEFT JOIN sys_user u ON t.publisher_id = u.id " +
|
||||
"LEFT JOIN sys_user pp ON t.primary_publisher_id = pp.id " +
|
||||
"LEFT JOIN sys_dept ppd ON t.primary_publisher_dept_id = ppd.id " +
|
||||
"LEFT JOIN sys_user dc ON t.detail_completer_id = dc.id " +
|
||||
"LEFT JOIN sys_user r ON ti.receiver_id = r.id " +
|
||||
"WHERE ti.status = 'in_progress' " +
|
||||
" AND t.deleted = 0 " +
|
||||
@ -168,11 +189,15 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
" t.task_sub_type AS taskSubType, " +
|
||||
" t.attachment_url AS attachmentUrl, " +
|
||||
" t.preview_image AS previewImage, " +
|
||||
" t.is_primary_task AS isPrimaryTask, " +
|
||||
" b.brand_name AS brandName, " +
|
||||
" c.category_name AS categoryName, " +
|
||||
" p.platform_name AS platformName, " +
|
||||
" dt.type_name AS taskTypeName, " +
|
||||
" u.real_name AS publisherName, " +
|
||||
" pp.real_name AS primaryPublisherName, " +
|
||||
" ppd.dept_name AS primaryPublisherDeptName, " +
|
||||
" dc.real_name AS detailCompleterName, " +
|
||||
" r.real_name AS receiverName, " +
|
||||
" (SELECT COUNT(*) FROM task_item WHERE task_id = ti.task_id) AS totalItems " +
|
||||
"FROM task_item ti " +
|
||||
@ -182,6 +207,9 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
"LEFT JOIN platform p ON t.platform_id = p.id " +
|
||||
"LEFT JOIN task_type dt ON ti.task_type_id = dt.id " +
|
||||
"LEFT JOIN sys_user u ON t.publisher_id = u.id " +
|
||||
"LEFT JOIN sys_user pp ON t.primary_publisher_id = pp.id " +
|
||||
"LEFT JOIN sys_dept ppd ON t.primary_publisher_dept_id = ppd.id " +
|
||||
"LEFT JOIN sys_user dc ON t.detail_completer_id = dc.id " +
|
||||
"LEFT JOIN sys_user r ON ti.receiver_id = r.id " +
|
||||
"WHERE ti.status = 'completed' " +
|
||||
" AND t.deleted = 0 " +
|
||||
@ -211,11 +239,15 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
" t.task_sub_type AS taskSubType, " +
|
||||
" t.attachment_url AS attachmentUrl, " +
|
||||
" t.preview_image AS previewImage, " +
|
||||
" t.is_primary_task AS isPrimaryTask, " +
|
||||
" b.brand_name AS brandName, " +
|
||||
" c.category_name AS categoryName, " +
|
||||
" p.platform_name AS platformName, " +
|
||||
" dt.type_name AS taskTypeName, " +
|
||||
" u.real_name AS publisherName, " +
|
||||
" pp.real_name AS primaryPublisherName, " +
|
||||
" ppd.dept_name AS primaryPublisherDeptName, " +
|
||||
" dc.real_name AS detailCompleterName, " +
|
||||
" r.real_name AS receiverName, " +
|
||||
" (SELECT COUNT(*) FROM task_item WHERE task_id = ti.task_id) AS totalItems " +
|
||||
"FROM task_item ti " +
|
||||
@ -225,6 +257,9 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
"LEFT JOIN platform p ON t.platform_id = p.id " +
|
||||
"LEFT JOIN task_type dt ON ti.task_type_id = dt.id " +
|
||||
"LEFT JOIN sys_user u ON t.publisher_id = u.id " +
|
||||
"LEFT JOIN sys_user pp ON t.primary_publisher_id = pp.id " +
|
||||
"LEFT JOIN sys_dept ppd ON t.primary_publisher_dept_id = ppd.id " +
|
||||
"LEFT JOIN sys_user dc ON t.detail_completer_id = dc.id " +
|
||||
"LEFT JOIN sys_user r ON ti.receiver_id = r.id " +
|
||||
"WHERE ti.status = 'in_progress' " +
|
||||
" AND t.deleted = 0 " +
|
||||
@ -255,11 +290,15 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
" t.task_sub_type AS taskSubType, " +
|
||||
" t.attachment_url AS attachmentUrl, " +
|
||||
" t.preview_image AS previewImage, " +
|
||||
" t.is_primary_task AS isPrimaryTask, " +
|
||||
" b.brand_name AS brandName, " +
|
||||
" c.category_name AS categoryName, " +
|
||||
" p.platform_name AS platformName, " +
|
||||
" dt.type_name AS taskTypeName, " +
|
||||
" u.real_name AS publisherName, " +
|
||||
" pp.real_name AS primaryPublisherName, " +
|
||||
" ppd.dept_name AS primaryPublisherDeptName, " +
|
||||
" dc.real_name AS detailCompleterName, " +
|
||||
" r.real_name AS receiverName, " +
|
||||
" (SELECT COUNT(*) FROM task_item WHERE task_id = ti.task_id) AS totalItems " +
|
||||
"FROM task_item ti " +
|
||||
@ -269,6 +308,9 @@ public interface TaskItemMapper extends BaseMapper<TaskItem> {
|
||||
"LEFT JOIN platform p ON t.platform_id = p.id " +
|
||||
"LEFT JOIN task_type dt ON ti.task_type_id = dt.id " +
|
||||
"LEFT JOIN sys_user u ON t.publisher_id = u.id " +
|
||||
"LEFT JOIN sys_user pp ON t.primary_publisher_id = pp.id " +
|
||||
"LEFT JOIN sys_dept ppd ON t.primary_publisher_dept_id = ppd.id " +
|
||||
"LEFT JOIN sys_user dc ON t.detail_completer_id = dc.id " +
|
||||
"LEFT JOIN sys_user r ON ti.receiver_id = r.id " +
|
||||
"WHERE ti.status = 'completed' " +
|
||||
" AND t.deleted = 0 " +
|
||||
|
||||
@ -4897,7 +4897,12 @@ const mapTaskItemToTask = (item: any) => {
|
||||
startTime: item.createTime, // 使用创建时间作为开始时间
|
||||
isPipeline: item.isPipeline, // 是否流水线任务(从主任务获取)
|
||||
subTasks: item.subTasks, // 同一主任务的所有子任务列表
|
||||
subTaskTotal: item.subTaskTotal || (item.subTasks ? item.subTasks.length : 0) // 子任务总数
|
||||
subTaskTotal: item.subTaskTotal || (item.subTasks ? item.subTasks.length : 0), // 子任务总数
|
||||
// 🔥 一级需求任务相关字段
|
||||
isPrimaryTask: item.isPrimaryTask, // 是否一级需求任务
|
||||
primaryPublisherName: item.primaryPublisherName, // 一级需求发起人姓名
|
||||
primaryPublisherDeptName: item.primaryPublisherDeptName, // 一级需求发起人部门名称
|
||||
detailCompleterName: item.detailCompleterName // 明细完善人姓名
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user