From bb166c074285ec2d47b7e61503eca7097a7b2010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 2 Apr 2026 11:01:27 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=80=E4=BA=9B=E6=97=A0=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/mapper/FlwHisTaskMapper.java | 2 +- .../workflow/mapper/FlwUserMapper.java | 107 +----------------- 2 files changed, 2 insertions(+), 107 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java index 594d0903c..46b92793a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java @@ -64,7 +64,7 @@ public interface FlwHisTaskMapper extends BaseMapperPlus, MPJBaseMapper { - default Page getListRunTask(Page page, FlowTaskBo bo, List categoryIds, String userId) { - Map params = bo.getParams(); - MPJLambdaWrapper wrapper = JoinWrappers.lambda("t", FlowTask.class) - .distinct() - .selectAs(FlowTask::getId, FlowTaskVo::getId) - .selectAs(FlowTask::getNodeCode, FlowTaskVo::getNodeCode) - .selectAs(FlowTask::getNodeName, FlowTaskVo::getNodeName) - .selectAs(FlowTask::getNodeType, FlowTaskVo::getNodeType) - .selectAs(FlowTask::getDefinitionId, FlowTaskVo::getDefinitionId) - .selectAs(FlowTask::getInstanceId, FlowTaskVo::getInstanceId) - .selectAs(FlowTask::getCreateTime, FlowTaskVo::getCreateTime) - .selectAs(FlowTask::getUpdateTime, FlowTaskVo::getUpdateTime) - .selectAs("i", FlowInstance::getBusinessId, FlowTaskVo::getBusinessId) - .selectAs("i", FlowInstance::getFlowStatus, FlowTaskVo::getFlowStatus) - .selectAs("i", FlowInstance::getCreateBy, FlowTaskVo::getCreateBy) - .selectAs("d", FlowDefinition::getFlowName, FlowTaskVo::getFlowName) - .selectAs("d", FlowDefinition::getFlowCode, FlowTaskVo::getFlowCode) - .selectAs("d", FlowDefinition::getFormCustom, FlowTaskVo::getFormCustom) - .selectAs("d", FlowDefinition::getCategory, FlowTaskVo::getCategory) - .selectAs("d", FlowDefinition::getVersion, FlowTaskVo::getVersion) - .selectAs("uu", FlowUser::getProcessedBy, FlowTaskVo::getProcessedBy) - .selectAs("uu", FlowUser::getType, FlowTaskVo::getType) - .selectAs("biz", FlowInstanceBizExt::getBusinessCode, FlowTaskVo::getBusinessCode) - .selectAs("biz", FlowInstanceBizExt::getBusinessTitle, FlowTaskVo::getBusinessTitle) - .selectAs("COALESCE(NULLIF(TRIM(t.form_path), ''), NULLIF(TRIM(d.form_path), ''))", FlowTaskVo::getFormPath) - .leftJoin(FlowUser.class, "uu", FlowUser::getAssociated, FlowTask::getId) - .leftJoin(FlowDefinition.class, "d", FlowDefinition::getId, FlowTask::getDefinitionId) - .leftJoin(FlowInstance.class, "i", FlowInstance::getId, FlowTask::getInstanceId) - .leftJoin(FlowInstanceBizExt.class, "biz", FlowInstanceBizExt::getInstanceId, FlowInstance::getId) - .eq("t", FlowTask::getNodeType, NodeType.BETWEEN.getKey()) - .eq("t", FlowTask::getDelFlag, NOT_DELETED) - .eq("uu", FlowUser::getDelFlag, NOT_DELETED) - .in("uu", FlowUser::getType, List.of("1", "2", "3")) - .like(StringUtils.isNotBlank(bo.getNodeName()), "t", FlowTask::getNodeName, bo.getNodeName()) - .like(StringUtils.isNotBlank(bo.getFlowName()), "d", FlowDefinition::getFlowName, bo.getFlowName()) - .like(StringUtils.isNotBlank(bo.getFlowCode()), "d", FlowDefinition::getFlowCode, bo.getFlowCode()) - .like(StringUtils.isNotBlank(bo.getFlowStatus()), "i", FlowInstance::getFlowStatus, bo.getFlowStatus()) - .in(CollUtil.isNotEmpty(bo.getCreateByIds()), "i", FlowInstance::getCreateBy, bo.getCreateByIds()) - .in(CollUtil.isNotEmpty(categoryIds), "d", FlowDefinition::getCategory, categoryIds) - .between(params.get("beginTime") != null && params.get("endTime") != null, - "t", FlowTask::getCreateTime, params.get("beginTime"), params.get("endTime")) - .eq(StringUtils.isNotBlank(userId), "uu", FlowUser::getProcessedBy, userId) - .eq(StringUtils.isNotBlank(userId), "i", FlowInstance::getFlowStatus, BusinessStatusEnum.WAITING.getStatus()) - .orderByDesc("t", FlowTask::getCreateTime) - .orderByDesc("t", FlowTask::getUpdateTime); - return wrapper.page(page, FlowTaskVo.class); - } - - default Page getTaskCopyByPage(Page page, FlowTaskBo bo, List categoryIds, String userId) { - Map params = bo.getParams(); - MPJLambdaWrapper wrapper = JoinWrappers.lambda("a", FlowUser.class) - .selectAs("b", FlowHisTask::getId, FlowTaskVo::getId) - .selectAs("b", FlowHisTask::getUpdateTime, FlowTaskVo::getUpdateTime) - .selectAs("c", FlowInstance::getBusinessId, FlowTaskVo::getBusinessId) - .selectAs("c", FlowInstance::getFlowStatus, FlowTaskVo::getFlowStatus) - .selectAs("c", FlowInstance::getCreateBy, FlowTaskVo::getCreateBy) - .selectAs(FlowUser::getProcessedBy, FlowTaskVo::getProcessedBy) - .selectAs(FlowUser::getCreateTime, FlowTaskVo::getCreateTime) - .selectAs("b", FlowHisTask::getFormCustom, FlowTaskVo::getFormCustom) - .selectAs("b", FlowHisTask::getFormPath, FlowTaskVo::getFormPath) - .selectAs("b", FlowHisTask::getNodeName, FlowTaskVo::getNodeName) - .selectAs("b", FlowHisTask::getNodeCode, FlowTaskVo::getNodeCode) - .selectAs("d", FlowDefinition::getFlowName, FlowTaskVo::getFlowName) - .selectAs("d", FlowDefinition::getFlowCode, FlowTaskVo::getFlowCode) - .selectAs("d", FlowDefinition::getCategory, FlowTaskVo::getCategory) - .selectAs("d", FlowDefinition::getVersion, FlowTaskVo::getVersion) - .selectAs("biz", FlowInstanceBizExt::getBusinessCode, FlowTaskVo::getBusinessCode) - .selectAs("biz", FlowInstanceBizExt::getBusinessTitle, FlowTaskVo::getBusinessTitle) - .leftJoin(FlowHisTask.class, "b", FlowHisTask::getTaskId, FlowUser::getAssociated) - .leftJoin(FlowInstance.class, "c", FlowInstance::getId, FlowHisTask::getInstanceId) - .leftJoin(FlowDefinition.class, "d", FlowDefinition::getId, FlowInstance::getDefinitionId) - .leftJoin(FlowInstanceBizExt.class, "biz", FlowInstanceBizExt::getInstanceId, FlowInstance::getId) - .eq("a", FlowUser::getType, "4") - .eq("a", FlowUser::getDelFlag, NOT_DELETED) - .eq("b", FlowHisTask::getDelFlag, NOT_DELETED) - .eq("d", FlowDefinition::getDelFlag, NOT_DELETED) - .like(StringUtils.isNotBlank(bo.getNodeName()), "b", FlowHisTask::getNodeName, bo.getNodeName()) - .like(StringUtils.isNotBlank(bo.getFlowName()), "d", FlowDefinition::getFlowName, bo.getFlowName()) - .like(StringUtils.isNotBlank(bo.getFlowCode()), "d", FlowDefinition::getFlowCode, bo.getFlowCode()) - .like(StringUtils.isNotBlank(bo.getFlowStatus()), "c", FlowInstance::getFlowStatus, bo.getFlowStatus()) - .in(CollUtil.isNotEmpty(bo.getCreateByIds()), "c", FlowInstance::getCreateBy, bo.getCreateByIds()) - .in(CollUtil.isNotEmpty(categoryIds), "d", FlowDefinition::getCategory, categoryIds) - .between(params.get("beginTime") != null && params.get("endTime") != null, - "a", FlowUser::getCreateTime, params.get("beginTime"), params.get("endTime")) - .eq(StringUtils.isNotBlank(userId), "a", FlowUser::getProcessedBy, userId) - .orderByDesc("a", FlowUser::getCreateTime) - .orderByDesc("b", FlowHisTask::getUpdateTime); - return wrapper.page(page, FlowTaskVo.class); - } - }