diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessCrossoverMapper.java index 3899d0e2a5985a9127cf0297ac738f249fc68bb9..e8741cf887cc068411a95fb70115f05e75e9e4c1 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessCrossoverMapper.java @@ -68,13 +68,13 @@ public interface IProcessCrossoverMapper extends ICrossoverService { // String getEarliestProcessDraft(ProcessDraftVo processDraftVo); -// List getProcessStepWorkerPolicyListByProcessUuid(String processUuid); + List getProcessStepWorkerPolicyListByProcessUuid(String processUuid); // ProcessStepVo getProcessStepByUuid(String processStepUuid); ProcessScoreTemplateVo getProcessScoreTemplateByProcessUuid(String processUuid); -// ProcessStepVo getStartProcessStepByProcessUuid(String processUuid); + ProcessStepVo getStartProcessStepByProcessUuid(String processUuid); // ProcessSlaVo getProcessSlaByUuid(String caller); diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskCreateVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskCreateVo.java index 0dcc77bdc7d175dfa09cd8e0cd2bb481fa1ce68e..313b3f8f869162dbef7fdc19e4a64105c06832a8 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskCreateVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskCreateVo.java @@ -37,6 +37,7 @@ public class ProcessTaskCreateVo { private String source; private String region; private Long newProcessTaskId; + private JSONArray assignWorkerList; public String getChannel() { return channel; @@ -165,4 +166,12 @@ public class ProcessTaskCreateVo { public void setNewProcessTaskId(Long newProcessTaskId) { this.newProcessTaskId = newProcessTaskId; } + + public JSONArray getAssignWorkerList() { + return assignWorkerList; + } + + public void setAssignWorkerList(JSONArray assignWorkerList) { + this.assignWorkerList = assignWorkerList; + } } diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepTaskUserContentVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepTaskUserContentVo.java index a3a4bacfc8d974b8d94fa4425c304d826db54a37..7c06108017c5278ea1334c68901c5ad095bb7cb0 100755 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepTaskUserContentVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepTaskUserContentVo.java @@ -48,6 +48,8 @@ public class ProcessTaskStepTaskUserContentVo extends BaseEditorVo { private String contentHash; @EntityField(name = "内容", type = ApiParamType.STRING) private String content; + @EntityField(name = "完成时点击的操作按钮", type = ApiParamType.STRING) + private String button; public ProcessTaskStepTaskUserContentVo() { } @@ -139,4 +141,12 @@ public class ProcessTaskStepTaskUserContentVo extends BaseEditorVo { public void setUserVo(UserVo userVo) { this.userVo = userVo; } + + public String getButton() { + return button; + } + + public void setButton(String button) { + this.button = button; + } } diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepTaskUserVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepTaskUserVo.java index d98b9791ed831de99784062de246e1ad5390b40b..45149ce8f8c6d7c0e275c9359576931d6409bbe3 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepTaskUserVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepTaskUserVo.java @@ -64,6 +64,9 @@ public class ProcessTaskStepTaskUserVo implements Serializable { private List fileIdList; @EntityField(name = "附件信息列表", type = ApiParamType.JSONARRAY) private List fileList; + @EntityField(name = "完成时点击的操作按钮", type = ApiParamType.STRING) + private String button; + public ProcessTaskStepTaskUserVo() { } @@ -203,4 +206,12 @@ public class ProcessTaskStepTaskUserVo implements Serializable { public void setFileList(List fileList) { this.fileList = fileList; } + + public String getButton() { + return button; + } + + public void setButton(String button) { + this.button = button; + } }