From 5361325478a355048544508376ef2be10e9c00ae Mon Sep 17 00:00:00 2001 From: Echo <4759156@qq.com> Date: Wed, 22 May 2024 17:22:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B5=81=E7=A8=8B=E3=80=81?= =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E4=BB=BB=E5=8A=A1=E3=80=81=E5=B7=B2=E5=8A=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=81=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=AA=E6=9F=A5=E8=AF=A2=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E4=B8=BAoa=5F=E5=BC=80=E5=A4=B4=E7=9A=84?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java | 6 ++++++ .../yudao/module/bpm/service/task/BpmTaskServiceImpl.java | 6 ++++++ .../resources/mapper/task/BpmProcessInstanceExtMapper.xml | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java index 8128614e..b41f90e9 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java @@ -18,6 +18,8 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX selectCCPage(Long userId, BpmProcessInstanceMyPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() // .eqIfPresent(BpmProcessInstanceExtDO::getStartUserId, userId) + //只能查询流程标识定义为oa开头的流程 + .likeIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_") .likeIfPresent(BpmProcessInstanceExtDO::getCcids, "[" + userId + "]") .eqIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, reqVO.getProcessDefinitionId()) .eqIfPresent(BpmProcessInstanceExtDO::getCategory, reqVO.getCategory()) @@ -30,6 +32,8 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX selectPage(Long userId, BpmProcessInstanceMyPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + //只能查询流程标识定义为oa开头的流程 + .likeIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_") .eqIfPresent(BpmProcessInstanceExtDO::getStartUserId, userId) .likeIfPresent(BpmProcessInstanceExtDO::getName, reqVO.getName()) .eqIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, reqVO.getProcessDefinitionId()) @@ -57,6 +61,8 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX selectStatisticePage(BpmProcessInstanceMyPageReqVO reqVO) { //如果为空，那么查询全部 return selectPage(reqVO, new LambdaQueryWrapperX() + //只能查询流程标识定义为oa开头的流程 + .likeIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_leave") .likeIfPresent(BpmProcessInstanceExtDO::getName, reqVO.getName()) .eqIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, reqVO.getProcessDefinitionId()) .eqIfPresent(BpmProcessInstanceExtDO::getCategory, reqVO.getCategory()) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java index 3e125832..8a17dabb 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java @@ -138,10 +138,13 @@ public class BpmTaskServiceImpl implements BpmTaskService { public PageResult getTodoTaskPage(Long userId, BpmTaskTodoPageReqVO pageVO) { // 查询待办任务 TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(String.valueOf(userId)) // 分配给自己 + //只能查询流程标识定义为oa开头的流程 + .processDefinitionKeyLike("oa_%") .orderByTaskCreateTime().desc(); // 创建时间倒序 if (StrUtil.isNotBlank(pageVO.getName())) { //流程定义的名称 taskQuery.processDefinitionName(pageVO.getName()); + // taskQuery.taskNameLike("%" + pageVO.getName() + "%"); } if (ArrayUtil.get(pageVO.getCreateTime(), 0) != null) { @@ -178,6 +181,8 @@ public class BpmTaskServiceImpl implements BpmTaskService { queryWrapperX.eq(BpmTaskExtDO::getDeleted, false); queryWrapperX.groupBy(BpmTaskExtDO::getName); queryWrapperX.select(BpmTaskExtDO::getName); + //只能查询流程标识定义为oa开头的流程 + queryWrapperX.likeIfPresent(BpmTaskExtDO::getProcessDefinitionId,"oa_"); List list = taskExtMapper.selectList(queryWrapperX); List taskNames = list.stream().map(BpmTaskExtDO::getName) .collect(Collectors.toList()); @@ -185,6 +190,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { // 查询已办任务 HistoricTaskInstanceQuery taskQuery = historyService.createHistoricTaskInstanceQuery().finished() // 已完成 .taskAssignee(String.valueOf(userId)) // 分配给自己 + .processDefinitionKeyLike("oa_%") .orderByHistoricTaskInstanceEndTime().desc(); // 审批时间倒序 if (taskNames != null && !taskNames.isEmpty()) { /** diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/task/BpmProcessInstanceExtMapper.xml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/task/BpmProcessInstanceExtMapper.xml index 35470cec..47175070 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/task/BpmProcessInstanceExtMapper.xml +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/task/BpmProcessInstanceExtMapper.xml @@ -19,6 +19,7 @@ #{id} + AND process_definition_id like 'oa_%' GROUP BY name @@ -42,6 +43,7 @@ #{id} + AND process_definition_id like 'oa_%' GROUP BY result @@ -55,6 +57,7 @@ WHERE end_time IS NOT NULL AND reason != '自动审批' AND deleted = FALSE + AND process_definition_id like 'oa_%' GROUP BY assignee_user_id order by userTime desc limit 0, 10 @@ -72,6 +75,7 @@ #{id} + AND process_definition_id like 'oa_%' GROUP BY assignee_user_id