diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java index c26a008fdbdafe5bee355efead3d21ac7926b77e..70fa4b7e79e5241ad0edd5e9f4b52d9a3456de9e 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java @@ -115,6 +115,8 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper { List getProcessTaskConvergeListByStepId(Long processTaskStepId); + List getProcessTaskConvergeListByProcessTaskId(Long processTaskId); + // List getFromProcessTaskStepByToId(Long toProcessTaskStepId); List getFromProcessTaskStepIdListByToId(Long toProcessTaskStepId); @@ -411,6 +413,8 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper { int insertIgnoreProcessTaskConverge(ProcessTaskConvergeVo processTaskConvergeVo); + int insertIgnoreProcessTaskConvergeList(List processTaskConvergeList); + int insertIgnoreProcessTaskStepConfig(ProcessTaskStepConfigVo processTaskStepConfigVo); // int insertProcessTaskStepFormAttribute( diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml index edcbc59373cbb9f66de24789cc8170806977604a..dff853de9dc65ccf3fea256f4cdfb5df02895b0a 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml @@ -574,8 +574,7 @@ b.`name`, b.`type`, b.`handler`, - b.`is_active` AS isActive, - a.`is_check` AS isCheck + b.`is_active` AS isActive FROM `processtask_converge` a JOIN `processtask_step` b ON a.`processtask_step_id` = b.`id` @@ -670,12 +669,20 @@ resultType="neatlogic.framework.process.dto.ProcessTaskConvergeVo"> SELECT `converge_id` AS convergeId, `processtask_step_id` AS processTaskStepId, - `processtask_id` AS processTaskId, - `is_check` AS isCkeck + `processtask_id` AS processTaskId FROM `processtask_converge` WHERE processtask_step_id = #{processTaskStepId} + +