From 8a6d32d4669509a2abfe01fbc9a93b4ef384f3f8 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:35:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=B5=81=E7=A8=8B=E6=96=B0?= =?UTF-8?q?=E7=89=88,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessInstanceTodoService.java | 12 +++++++++++- .../ProcessInstanceTodoServiceImpl.java | 14 +++++++++++++- .../home/service/clgl/ClglServiceImpl.java | 17 ++++++++--------- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/processinstancetodo/ProcessInstanceTodoService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/processinstancetodo/ProcessInstanceTodoService.java index 3efc976..139922c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/processinstancetodo/ProcessInstanceTodoService.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/processinstancetodo/ProcessInstanceTodoService.java @@ -17,6 +17,16 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. */ public interface ProcessInstanceTodoService { + /** + * oa模块创建插入 ProcessInstanceTodo + * + * @param title 标题 + * @param processKey key + * @param processInstanceId 流程id + * @param CurFullPath 创建路径 + */ + void oaCreateProcessInstanceTodo(String title, String processKey, String processInstanceId,String CurFullPath); + /** * 创建BPM 流程实例信息 * @@ -76,4 +86,4 @@ public interface ProcessInstanceTodoService { */ PageResult getProcessInstanceTodoPage(ProcessInstanceTodoPageReqVO pageReqVO); -} \ No newline at end of file +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/processinstancetodo/ProcessInstanceTodoServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/processinstancetodo/ProcessInstanceTodoServiceImpl.java index aa71d07..3f15be2 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/processinstancetodo/ProcessInstanceTodoServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/processinstancetodo/ProcessInstanceTodoServiceImpl.java @@ -31,6 +31,18 @@ public class ProcessInstanceTodoServiceImpl implements ProcessInstanceTodoServic @Resource private ProcessInstanceTodoMapper processInstanceTodoMapper; + @Override + public void oaCreateProcessInstanceTodo(String title, String processKey, String processInstanceId, String CurFullPath) { + + ProcessInstanceTodoDO todo = new ProcessInstanceTodoDO(); + todo.setTitle(title); + todo.setProcessKey(processKey); + todo.setProcessInstanceId(processInstanceId); + todo.setFormCustomCreatePath(CurFullPath); + todo.setStatus(0); + processInstanceTodoMapper.insert(todo); + } + @Override public Long createProcessInstanceTodo(ProcessInstanceTodoSaveReqVO createReqVO) { // 插入 @@ -83,4 +95,4 @@ public class ProcessInstanceTodoServiceImpl implements ProcessInstanceTodoServic } return processInstanceTodoMapper.selectListByProcessinstandid(ids); } -} \ No newline at end of file +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java index a37ae19..0a8d0a3 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.dal.mysql.processinstancetodo.ProcessInstanceTodoMapper; import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum; +import cn.iocoder.yudao.module.bpm.service.processinstancetodo.ProcessInstanceTodoService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,9 +38,9 @@ public class ClglServiceImpl implements ClglService { @Resource private ClglMapper clglMapper; @Resource - private ProcessInstanceTodoMapper processInstanceTodoMapper; - @Resource private BpmProcessInstanceApi processInstanceApi; + @Resource + private ProcessInstanceTodoService processInstanceTodoService; @Override public Long createClgl(Long userId,ClglSaveReqVO createReqVO) { @@ -58,13 +59,11 @@ public class ClglServiceImpl implements ClglService { // 将工作流的编号,更新到 OA 请假单中 clglMapper.updateById(new ClglDO().setId(clgl.getId()).setProcessInstanceId(processInstanceId)); - ProcessInstanceTodoDO todo = new ProcessInstanceTodoDO(); - todo.setTitle(createReqVO.getTitle()); - todo.setProcessKey(PROCESS_KEY); - todo.setProcessInstanceId(processInstanceId); - todo.setFormCustomCreatePath(createReqVO.getCurfullpath()); - todo.setStatus(0); - processInstanceTodoMapper.insert(todo); + processInstanceTodoService.oaCreateProcessInstanceTodo( + createReqVO.getTitle(), + PROCESS_KEY, + processInstanceId, + createReqVO.getCurfullpath()); // 返回 return clgl.getId();