diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index 04a6d352bae26535a7b60334383f62719db5e93d..f9410b92318de0ba2454c404d07fecf32911411e 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java @@ -74,6 +74,8 @@ public interface IProcessTaskCrossoverMapper extends ICrossoverService { List getProcessTaskStepByProcessTaskIdAndType(@Param("processTaskId") Long processTaskId, @Param("type") String type); + List getProcessTaskStepListByProcessTaskId(Long processTaskId); + ProcessTaskStepVo getProcessTaskStepBaseInfoById(Long processTaskStepId); ProcessTaskVo getProcessTaskById(Long id); diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java index 24c26057ba34d9ae14ec7966fce0db5d0da94df9..87e0bf9cec342b1b197295f4efedc7ed91f23bdc 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java @@ -215,5 +215,11 @@ public interface IProcessTaskCrossoverService extends ICrossoverService { List relationProcessTaskIdList, String source ); + + /** + * 获取步骤列表中步骤信息 + * @param processTaskStepVo + */ + void getProcessTaskStepDetail(ProcessTaskStepVo processTaskStepVo); } diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java index 5f9d818fa05033b9b3bec977545ea8b3ad48a3cc..89b185f62656a71c5f54ecc177607628b9e2ba3b 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java @@ -165,9 +165,12 @@ public class ProcessTaskStepVo extends BasePageVo { @JSONField(serialize = false) private Long subProcessTaskId; //子工单id - @EntityField(name = "处理时查看步骤",type= ApiParamType.JSONARRAY) + @EntityField(name = "处理时查看步骤UUID列表",type= ApiParamType.JSONARRAY) private List viewPrevNodeUuidList; + @EntityField(name = "处理时查看步骤列表",type= ApiParamType.JSONARRAY) + private List viewPrevNodeList; + @EntityField(name = "是否在当前步骤标签中", type = ApiParamType.INTEGER) private Integer isInTheCurrentStepTab; @EntityField(name = "配置信息", type = ApiParamType.JSONOBJECT) @@ -872,6 +875,14 @@ public class ProcessTaskStepVo extends BasePageVo { this.viewPrevNodeUuidList = viewPrevNodeUuidList; } + public List getViewPrevNodeList() { + return viewPrevNodeList; + } + + public void setViewPrevNodeList(List viewPrevNodeList) { + this.viewPrevNodeList = viewPrevNodeList; + } + public Integer getIsInTheCurrentStepTab() { return isInTheCurrentStepTab; }