update 优化 删除一些无用方法

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java

@@ -64,7 +64,7 @@ public interface FlwHisTaskMapper extends BaseMapperPlus<FlowHisTask, FlowHisTas
             .eq("a", FlowHisTask::getDelFlag, NOT_DELETED)
             .eq("b", FlowInstance::getDelFlag, NOT_DELETED)
             .eq("c", FlowDefinition::getDelFlag, NOT_DELETED)
-            .in("a", FlowHisTask::getNodeType, List.of("1", "3", "4"))
+            .in("a", FlowHisTask::getNodeType, List.of("1", "3"))
             .like(StringUtils.isNotBlank(bo.getNodeName()), "a", FlowHisTask::getNodeName, bo.getNodeName())
             .like(StringUtils.isNotBlank(bo.getFlowName()), "c", FlowDefinition::getFlowName, bo.getFlowName())
             .like(StringUtils.isNotBlank(bo.getFlowCode()), "c", FlowDefinition::getFlowCode, bo.getFlowCode())

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java

@@ -9,10 +9,7 @@ import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.warm.flow.core.enums.NodeType;
-import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.warm.flow.orm.entity.*;
-import org.dromara.warm.flow.orm.entity.FlowInstance;
-import org.dromara.warm.flow.orm.entity.FlowTask;
-import org.dromara.warm.flow.orm.entity.FlowUser;
 import org.dromara.workflow.domain.FlowInstanceBizExt;
 import org.dromara.workflow.domain.bo.FlowTaskBo;
 import org.dromara.workflow.domain.vo.FlowTaskVo;
@@ -81,4 +78,49 @@ public interface FlwTaskMapper extends BaseMapperPlus<FlowTask, FlowTaskVo>, MPJ
         return wrapper.page(page, FlowTaskVo.class);
     }
 
+    default Page<FlowTaskVo> getTaskCopyByPage(Page<FlowTaskVo> page,
+                                               FlowTaskBo bo,
+                                               List<String> categoryIds,
+                                               String userId) {
+        Map<String, Object> params = bo.getParams();
+        MPJLambdaWrapper<FlowUser> 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);
+    }
+
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwUserMapper.java

@@ -25,49 +25,4 @@ import static org.dromara.workflow.common.constant.FlowConstant.NOT_DELETED;
  */
 public interface FlwUserMapper extends BaseMapperPlus<FlowUser, FlowUser>, MPJBaseMapper<FlowUser> {
 
-    default Page<FlowTaskVo> getTaskCopyByPage(Page<FlowTaskVo> page,
-                                               FlowTaskBo bo,
-                                               List<String> categoryIds,
-                                               String userId) {
-        Map<String, Object> params = bo.getParams();
-        MPJLambdaWrapper<FlowUser> 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);
-    }
-
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@@ -453,7 +453,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
      */
     @Override
     public PageResult<FlowTaskVo> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
-        Page<FlowTaskVo> page = flwUserMapper.getTaskCopyByPage(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), LoginHelper.getUserIdStr());
+        Page<FlowTaskVo> page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), LoginHelper.getUserIdStr());
         return PageResult.build(page.getRecords(), page.getTotal());
     }