From 5cc01859be6037f10667977508a16fd99a6a10db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 30 Jun 2022 17:41:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E3=80=81=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java | 2 ++ xm-core/src/main/java/com/xm/core/service/XmTaskService.java | 2 +- .../main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 31174081..36ae0666 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -246,6 +246,8 @@ public class XmTaskController { fields.add("childrenCnt"); fields.add("ntype"); fields.add("pidPaths"); + fields.add("parentTaskid"); + fields.add("parentTaskname"); fields.add("executorUserid"); for (String fieldName : xmTaskMap.keySet()) { if(fields.contains(fieldName)){ diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index 12317d8d..ba156774 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -712,7 +712,7 @@ public class XmTaskService extends BaseService { @Transactional public void batchChangeParent(List xmTasks,XmTask parentTask) { - super.update("batchChangeParent",map("taskIds",xmTasks.stream().map(i->i.getId()).collect(Collectors.toList()),"parentTaskid",parentTask.getId(),"parentPidPaths",parentTask.getPidPaths())); + super.update("batchChangeParent",map("taskIds",xmTasks.stream().map(i->i.getId()).collect(Collectors.toList()),"parentTaskid",parentTask.getId(),"parentTaskname",parentTask.getName(),"parentPidPaths",parentTask.getPidPaths())); pushService.pushXmTask(parentTask); } diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index c201efb7..13a58de6 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -275,7 +275,7 @@ update xm_task res inner join ( - select t.id,pid_paths,parent_taskid from xm_task t where t.id in + select t.id,pid_paths,parent_taskid,parent_taskname from xm_task t where t.id in #{item} @@ -283,6 +283,7 @@ set res.pid_paths = replace(res.pid_paths,t1.pid_paths,concat(#{parentPidPaths},res.id,',')), res.parent_taskid=if(res.id=t1.id,#{parentTaskid},res.parent_taskid), + res.parent_taskname=if(res.id=t1.id,#{parentTaskname},res.parent_taskname), res.lvl= LENGTH(replace(res.pid_paths,t1.pid_paths,concat(#{parentPidPaths},res.id,',')))-LENGTH(REPLACE(replace(res.pid_paths,t1.pid_paths,concat(#{parentPidPaths},res.id,',')),',',''))-1