From f0b758340483392d66ebc802a9c09d4506c5885c Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Sat, 6 Nov 2021 10:22:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E4=BB=8Eactiviti=20=E6=94=B9?= =?UTF-8?q?=E6=88=90=20bpm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/oa/OALeaveController.java | 10 ++++----- .../controller/oa/vo/OALeaveBaseVO.java | 2 +- .../controller/oa/vo/OALeaveCreateReqVO.java | 2 +- .../controller/oa/vo/OALeaveExcelVO.java | 2 +- .../controller/oa/vo/OALeaveExportReqVO.java | 2 +- .../controller/oa/vo/OALeavePageReqVO.java | 2 +- .../controller/oa/vo/OALeaveRespVO.java | 2 +- .../controller/oa/vo/OALeaveUpdateReqVO.java | 2 +- .../workflow/ProcessDefinitionController.java | 2 +- .../controller/workflow/TaskController.java | 6 +++--- .../controller/workflow/vo/TaskHandleVO.java | 2 +- .../workflow/vo/TaskQueryReqVO.java | 2 +- .../controller/workflow/vo/TaskReqVO.java | 2 +- .../controller/workflow/vo/TaskStepVO.java | 2 +- .../workflow/vo/TodoTaskPageReqVO.java | 2 +- .../workflow/vo/TodoTaskRespVO.java | 5 ++++- .../convert/oa/OALeaveConvert.java | 9 +++++--- .../convert/workflow/TaskConvert.java | 9 ++++---- .../dal/dataobject/leave}/OALeaveDO.java | 2 +- .../process/ProcessDefinitionDO.java | 2 +- .../dal/mysql/oa/OALeaveMapper.java | 7 ++++--- .../enums/oa}/OAErrorCodeConstants.java | 2 +- .../config/UserGroupManagerService.java | 2 +- .../service/config/UserGroupsProvider.java | 2 +- .../service/oa/OALeaveService.java | 12 +++++------ .../service/oa/ReportBackEndProcessor.java | 6 +++--- .../service/oa/impl/OALeaveServiceImpl.java | 20 +++++++++--------- .../service/process/ProcessService.java | 2 +- .../process/impl/ProcessServiceImpl.java | 4 ++-- .../service/workflow/TaskService.java | 4 ++-- .../workflow/impl/TaskServiceImpl.java | 19 +++++++---------- .../src/views/oa/leave/approve-hr/index.vue | 11 +++++++--- yudao-admin-ui/src/views/oa/todo/index.vue | 21 ++----------------- 33 files changed, 87 insertions(+), 94 deletions(-) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/oa/OALeaveController.java (92%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/oa/vo/OALeaveBaseVO.java (95%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/oa/vo/OALeaveCreateReqVO.java (78%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/oa/vo/OALeaveExcelVO.java (91%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/oa/vo/OALeaveExportReqVO.java (96%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/oa/vo/OALeavePageReqVO.java (96%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/oa/vo/OALeaveRespVO.java (80%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/oa/vo/OALeaveUpdateReqVO.java (91%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/workflow/ProcessDefinitionController.java (94%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/workflow/TaskController.java (90%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/workflow/vo/TaskHandleVO.java (74%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/workflow/vo/TaskQueryReqVO.java (70%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/workflow/vo/TaskReqVO.java (73%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/workflow/vo/TaskStepVO.java (78%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/workflow/vo/TodoTaskPageReqVO.java (82%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/controller/workflow/vo/TodoTaskRespVO.java (80%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/convert/oa/OALeaveConvert.java (58%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/convert/workflow/TaskConvert.java (80%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti/dal/dataobject/oa => bpm/dal/dataobject/leave}/OALeaveDO.java (92%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/dal/dataobject/process/ProcessDefinitionDO.java (84%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/dal/mysql/oa/OALeaveMapper.java (86%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti/enums => bpm/enums/oa}/OAErrorCodeConstants.java (83%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/service/config/UserGroupManagerService.java (96%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/service/config/UserGroupsProvider.java (92%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/service/oa/OALeaveService.java (73%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/service/oa/ReportBackEndProcessor.java (79%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/service/oa/impl/OALeaveServiceImpl.java (84%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/service/process/ProcessService.java (88%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/service/process/impl/ProcessServiceImpl.java (96%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/service/workflow/TaskService.java (85%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{activiti => bpm}/service/workflow/impl/TaskServiceImpl.java (96%) diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/OALeaveController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/OALeaveController.java similarity index 92% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/OALeaveController.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/OALeaveController.java index 2980bc12c..0b741384f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/OALeaveController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/OALeaveController.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.oa; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.oa; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.*; -import cn.iocoder.yudao.adminserver.modules.activiti.convert.oa.OALeaveConvert; -import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.oa.OALeaveDO; -import cn.iocoder.yudao.adminserver.modules.activiti.service.oa.OALeaveService; +import cn.iocoder.yudao.adminserver.modules.bpm.convert.oa.OALeaveConvert; +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave.OALeaveDO; +import cn.iocoder.yudao.adminserver.modules.bpm.service.oa.OALeaveService; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.*; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveBaseVO.java similarity index 95% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveBaseVO.java index bf88ec76c..72d1a5e70 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveBaseVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo; import lombok.*; import java.util.*; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveCreateReqVO.java similarity index 78% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveCreateReqVO.java index 956100f5a..28df3344c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveCreateReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo; import lombok.*; import io.swagger.annotations.*; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveExcelVO.java similarity index 91% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveExcelVO.java index d305ef6e5..9280529c8 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveExcelVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo; import lombok.*; import java.util.*; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveExportReqVO.java similarity index 96% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveExportReqVO.java index 92d0f43a6..e07d66f28 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveExportReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo; import lombok.*; import java.util.*; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeavePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeavePageReqVO.java similarity index 96% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeavePageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeavePageReqVO.java index 5c3306dcd..ea7371523 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeavePageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeavePageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo; import lombok.*; import java.util.*; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveRespVO.java similarity index 80% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveRespVO.java index fe9c8d35e..161879cc0 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveRespVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo; import lombok.*; import io.swagger.annotations.*; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveUpdateReqVO.java similarity index 91% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveUpdateReqVO.java index 649e56dd4..a9264c9ea 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/oa/vo/OALeaveUpdateReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/OALeaveUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/ProcessDefinitionController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/ProcessDefinitionController.java similarity index 94% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/ProcessDefinitionController.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/ProcessDefinitionController.java index a47867c49..cb1010f62 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/ProcessDefinitionController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/ProcessDefinitionController.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import org.activiti.api.process.runtime.ProcessRuntime; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/TaskController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/TaskController.java similarity index 90% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/TaskController.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/TaskController.java index e28a9c886..9aa0500c3 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/TaskController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/TaskController.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo.*; -import cn.iocoder.yudao.adminserver.modules.activiti.service.workflow.TaskService; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo.*; +import cn.iocoder.yudao.adminserver.modules.bpm.service.workflow.TaskService; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import io.swagger.annotations.Api; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskHandleVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskHandleVO.java similarity index 74% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskHandleVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskHandleVO.java index 3ef40fa32..fff775a73 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskHandleVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskHandleVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo; import lombok.Data; import lombok.ToString; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskQueryReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskQueryReqVO.java similarity index 70% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskQueryReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskQueryReqVO.java index fab24a948..d67fad001 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskQueryReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskQueryReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo; import lombok.Data; import lombok.ToString; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskReqVO.java similarity index 73% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskReqVO.java index 8e3eb6079..0657ae79d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo; import lombok.Data; import lombok.ToString; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskStepVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskStepVO.java similarity index 78% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskStepVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskStepVO.java index b1bb93ac6..5d8433e80 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TaskStepVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TaskStepVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo; import lombok.Data; import lombok.ToString; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TodoTaskPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TodoTaskPageReqVO.java similarity index 82% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TodoTaskPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TodoTaskPageReqVO.java index b5dddbc61..411b23d52 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TodoTaskPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TodoTaskPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.annotations.ApiModel; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TodoTaskRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TodoTaskRespVO.java similarity index 80% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TodoTaskRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TodoTaskRespVO.java index 11af4e8e1..93184a2fb 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/controller/workflow/vo/TodoTaskRespVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/workflow/vo/TodoTaskRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo; +package cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -13,6 +13,9 @@ public class TodoTaskRespVO { private String id; + + private String processInstanceId; + /** * 1:未签收 * 2:已签收 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/convert/oa/OALeaveConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/oa/OALeaveConvert.java similarity index 58% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/convert/oa/OALeaveConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/oa/OALeaveConvert.java index 48151383c..4da3d56bf 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/convert/oa/OALeaveConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/oa/OALeaveConvert.java @@ -1,13 +1,16 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.convert.oa; +package cn.iocoder.yudao.adminserver.modules.bpm.convert.oa; import java.util.*; -import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.oa.OALeaveDO; +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave.OALeaveDO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveCreateReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveExcelVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveRespVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveUpdateReqVO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.*; /** * 请假申请 Convert diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/convert/workflow/TaskConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/workflow/TaskConvert.java similarity index 80% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/convert/workflow/TaskConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/workflow/TaskConvert.java index d461eb992..8d2bd639c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/convert/workflow/TaskConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/workflow/TaskConvert.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.convert.workflow; +package cn.iocoder.yudao.adminserver.modules.bpm.convert.workflow; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo.TaskStepVO; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo.TodoTaskRespVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo.TaskStepVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo.TodoTaskRespVO; import org.activiti.api.task.model.Task; import org.activiti.engine.history.HistoricActivityInstance; import org.activiti.engine.repository.ProcessDefinition; @@ -20,7 +20,8 @@ public interface TaskConvert { @Mapping(source = "task.businessKey", target = "businessKey"), @Mapping(source = "task.assignee", target = "status",qualifiedByName = "convertAssigneeToStatus"), @Mapping(source = "definition.name", target = "processName"), - @Mapping(source = "definition.key", target = "processKey") + @Mapping(source = "definition.key", target = "processKey"), + @Mapping(source = "definition.id", target = "processInstanceId") }) TodoTaskRespVO convert(Task task, ProcessDefinition definition); diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/dataobject/oa/OALeaveDO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/OALeaveDO.java similarity index 92% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/dataobject/oa/OALeaveDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/OALeaveDO.java index c3d760c44..b088b7b9c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/dataobject/oa/OALeaveDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/OALeaveDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.oa; +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave; import lombok.*; import java.util.*; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/dataobject/process/ProcessDefinitionDO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/process/ProcessDefinitionDO.java similarity index 84% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/dataobject/process/ProcessDefinitionDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/process/ProcessDefinitionDO.java index 7913d1ee6..d023c91f4 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/dataobject/process/ProcessDefinitionDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/process/ProcessDefinitionDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.process; +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.process; /** * 流程模型实体类 映射 activiti ProcessDefinition接口 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/mysql/oa/OALeaveMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/oa/OALeaveMapper.java similarity index 86% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/mysql/oa/OALeaveMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/oa/OALeaveMapper.java index adf1a2591..7da1e5479 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/dal/mysql/oa/OALeaveMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/oa/OALeaveMapper.java @@ -1,13 +1,14 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.dal.mysql.oa; +package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.oa; import java.util.*; -import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.oa.OALeaveDO; +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave.OALeaveDO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveExportReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeavePageReqVO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.*; /** * 请假申请 Mapper diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/enums/OAErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/oa/OAErrorCodeConstants.java similarity index 83% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/enums/OAErrorCodeConstants.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/oa/OAErrorCodeConstants.java index 9a042fcb7..33495c13d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/enums/OAErrorCodeConstants.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/oa/OAErrorCodeConstants.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.enums; +package cn.iocoder.yudao.adminserver.modules.bpm.enums.oa; import cn.iocoder.yudao.framework.common.exception.ErrorCode; /** diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/config/UserGroupManagerService.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/config/UserGroupManagerService.java similarity index 96% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/config/UserGroupManagerService.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/config/UserGroupManagerService.java index 14450e346..7ca957cd3 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/config/UserGroupManagerService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/config/UserGroupManagerService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.service.config; +package cn.iocoder.yudao.adminserver.modules.bpm.service.config; import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/config/UserGroupsProvider.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/config/UserGroupsProvider.java similarity index 92% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/config/UserGroupsProvider.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/config/UserGroupsProvider.java index 3f8b55299..dc81449ff 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/config/UserGroupsProvider.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/config/UserGroupsProvider.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.service.config; +package cn.iocoder.yudao.adminserver.modules.bpm.service.config; import cn.iocoder.yudao.framework.security.core.LoginUser; import org.activiti.api.runtime.shared.security.PrincipalGroupsProvider; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/oa/OALeaveService.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/OALeaveService.java similarity index 73% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/oa/OALeaveService.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/OALeaveService.java index 6d3ae3613..21c75eaea 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/oa/OALeaveService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/OALeaveService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.service.oa; +package cn.iocoder.yudao.adminserver.modules.bpm.service.oa; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.OALeaveCreateReqVO; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.OALeaveUpdateReqVO; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.OALeaveExportReqVO; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.OALeavePageReqVO; -import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.oa.OALeaveDO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveCreateReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveUpdateReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveExportReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeavePageReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave.OALeaveDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import javax.validation.Valid; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/oa/ReportBackEndProcessor.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/ReportBackEndProcessor.java similarity index 79% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/oa/ReportBackEndProcessor.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/ReportBackEndProcessor.java index 4da877d96..2966c5e7e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/oa/ReportBackEndProcessor.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/ReportBackEndProcessor.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.service.oa; +package cn.iocoder.yudao.adminserver.modules.bpm.service.oa; -import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.oa.OALeaveDO; -import cn.iocoder.yudao.adminserver.modules.activiti.dal.mysql.oa.OALeaveMapper; +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave.OALeaveDO; +import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.oa.OALeaveMapper; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.ExecutionListener; import org.springframework.stereotype.Component; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/oa/impl/OALeaveServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/impl/OALeaveServiceImpl.java similarity index 84% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/oa/impl/OALeaveServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/impl/OALeaveServiceImpl.java index 8d113c21b..7627f9d8d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/oa/impl/OALeaveServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/impl/OALeaveServiceImpl.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.service.oa.impl; +package cn.iocoder.yudao.adminserver.modules.bpm.service.oa.impl; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.OALeaveCreateReqVO; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.OALeaveUpdateReqVO; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.OALeaveExportReqVO; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.oa.vo.OALeavePageReqVO; -import cn.iocoder.yudao.adminserver.modules.activiti.convert.oa.OALeaveConvert; -import cn.iocoder.yudao.adminserver.modules.activiti.dal.dataobject.oa.OALeaveDO; -import cn.iocoder.yudao.adminserver.modules.activiti.dal.mysql.oa.OALeaveMapper; -import cn.iocoder.yudao.adminserver.modules.activiti.service.oa.OALeaveService; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveCreateReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveUpdateReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeaveExportReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.OALeavePageReqVO; +import cn.iocoder.yudao.adminserver.modules.bpm.convert.oa.OALeaveConvert; +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave.OALeaveDO; +import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.oa.OALeaveMapper; +import cn.iocoder.yudao.adminserver.modules.bpm.service.oa.OALeaveService; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import org.activiti.api.task.model.Task; @@ -22,7 +22,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.*; -import static cn.iocoder.yudao.adminserver.modules.activiti.enums.OAErrorCodeConstants.LEAVE_NOT_EXISTS; +import static cn.iocoder.yudao.adminserver.modules.bpm.enums.oa.OAErrorCodeConstants.LEAVE_NOT_EXISTS; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; /** diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/process/ProcessService.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/process/ProcessService.java similarity index 88% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/process/ProcessService.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/process/ProcessService.java index bd829353d..6a0d636cf 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/process/ProcessService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/process/ProcessService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.service.process; +package cn.iocoder.yudao.adminserver.modules.bpm.service.process; import org.springframework.web.multipart.MultipartFile; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/process/impl/ProcessServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/process/impl/ProcessServiceImpl.java similarity index 96% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/process/impl/ProcessServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/process/impl/ProcessServiceImpl.java index 2e3d04b1d..a084cbe25 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/process/impl/ProcessServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/process/impl/ProcessServiceImpl.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.service.process.impl; +package cn.iocoder.yudao.adminserver.modules.bpm.service.process.impl; -import cn.iocoder.yudao.adminserver.modules.activiti.service.process.ProcessService; +import cn.iocoder.yudao.adminserver.modules.bpm.service.process.ProcessService; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RepositoryService; import org.activiti.engine.repository.Deployment; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/TaskService.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/TaskService.java similarity index 85% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/TaskService.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/TaskService.java index c5b020e87..5fb06e996 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/TaskService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/TaskService.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.service.workflow; +package cn.iocoder.yudao.adminserver.modules.bpm.service.workflow; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo.*; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo.*; import cn.iocoder.yudao.framework.common.pojo.PageResult; import javax.servlet.http.HttpServletResponse; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/impl/TaskServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/impl/TaskServiceImpl.java similarity index 96% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/impl/TaskServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/impl/TaskServiceImpl.java index c4e8823e8..399033000 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/impl/TaskServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/impl/TaskServiceImpl.java @@ -1,13 +1,11 @@ -package cn.iocoder.yudao.adminserver.modules.activiti.service.workflow.impl; +package cn.iocoder.yudao.adminserver.modules.bpm.service.workflow.impl; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.adminserver.modules.activiti.controller.workflow.vo.*; -import cn.iocoder.yudao.adminserver.modules.activiti.convert.workflow.TaskConvert; -import cn.iocoder.yudao.adminserver.modules.activiti.service.workflow.TaskService; +import cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo.*; +import cn.iocoder.yudao.adminserver.modules.bpm.convert.workflow.TaskConvert; +import cn.iocoder.yudao.adminserver.modules.bpm.service.workflow.TaskService; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import com.google.common.collect.ImmutableMap; import lombok.extern.slf4j.Slf4j; import org.activiti.api.runtime.shared.query.Page; import org.activiti.api.runtime.shared.query.Pageable; @@ -23,7 +21,6 @@ import org.activiti.engine.RepositoryService; import org.activiti.engine.RuntimeService; import org.activiti.engine.history.HistoricActivityInstance; import org.activiti.engine.history.HistoricProcessInstance; -import org.activiti.engine.history.HistoricTaskInstance; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Comment; @@ -35,9 +32,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; -import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; -import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; import java.net.URLEncoder; @@ -75,6 +70,7 @@ public class TaskServiceImpl implements TaskService { List tasks = pageTasks.getContent(); final List respVOList = tasks.stream().map(task -> { ProcessDefinition definition = repositoryService.getProcessDefinition(task.getProcessDefinitionId()); + definition.getId(); return TaskConvert.INSTANCE.convert(task, definition); }).collect(Collectors.toList()); return new PageResult<>(respVOList, (long)totalItems); @@ -188,6 +184,7 @@ public class TaskServiceImpl implements TaskService { respVO.setFormKey(task.getFormKey()); respVO.setBusinessKey(task.getBusinessKey()); respVO.setId(task.getId()); + respVO.setProcessInstanceId(task.getProcessInstanceId()); return respVO; } @@ -277,8 +274,8 @@ public class TaskServiceImpl implements TaskService { response.flushBuffer(); } /** - * 获取已经流转的线 - * @see https://blog.csdn.net/qiuxinfa123/article/details/119579863 + * 获取已经流转的线 https://blog.csdn.net/qiuxinfa123/article/details/119579863 + * @see * @param bpmnModel model * @param historicActivityInstances 高亮线条 * @return diff --git a/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue b/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue index 3016c96be..5e1468cb0 100644 --- a/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue +++ b/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue @@ -53,7 +53,10 @@ - 流程图-TODO + + + 流程图-TODO + @@ -61,7 +64,7 @@