Browse Source

文档、环境清单

master
陈裕财 4 years ago
parent
commit
5cc01859be
  1. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  2. 2
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java
  3. 3
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

2
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@ -246,6 +246,8 @@ public class XmTaskController {
fields.add("childrenCnt"); fields.add("childrenCnt");
fields.add("ntype"); fields.add("ntype");
fields.add("pidPaths"); fields.add("pidPaths");
fields.add("parentTaskid");
fields.add("parentTaskname");
fields.add("executorUserid"); fields.add("executorUserid");
for (String fieldName : xmTaskMap.keySet()) { for (String fieldName : xmTaskMap.keySet()) {
if(fields.contains(fieldName)){ if(fields.contains(fieldName)){

2
xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@ -712,7 +712,7 @@ public class XmTaskService extends BaseService {
@Transactional @Transactional
public void batchChangeParent(List<XmTask> xmTasks,XmTask parentTask) { public void batchChangeParent(List<XmTask> 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); pushService.pushXmTask(parentTask);
} }

3
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@ -275,7 +275,7 @@
<update id="batchChangeParent" parameterType="HashMap"> <update id="batchChangeParent" parameterType="HashMap">
update xm_task res inner join ( 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
<foreach collection="taskIds" item="item" index="index" open="(" separator="," close=")" > <foreach collection="taskIds" item="item" index="index" open="(" separator="," close=")" >
#{item} #{item}
</foreach> </foreach>
@ -283,6 +283,7 @@
set res.pid_paths = replace(res.pid_paths,t1.pid_paths,concat(#{parentPidPaths},res.id,',')), 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_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 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
</update> </update>

Loading…
Cancel
Save