From e71a5aa934f0fde205f48dd29113ed5aaa2c7f8e 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 Jan 2025 14:24:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/workflow/mapper/FlwDefMapper.java | 27 ------------- .../impl/FlwDefinitionServiceImpl.java | 38 +++++++++---------- .../mapper/workflow/FlwDefMapper.xml | 28 -------------- 3 files changed, 18 insertions(+), 75 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java delete mode 100644 ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java deleted file mode 100644 index ba027486e..000000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.dromara.workflow.mapper; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.dromara.warm.flow.orm.entity.FlowDefinition; -import org.dromara.workflow.domain.vo.FlowDefinitionVo; - -/** - * 实例信息Mapper接口 - * - * @author may - * @date 2024-03-02 - */ -public interface FlwDefMapper { - - /** - * 流程实例信息 - * - * @param page 分页 - * @param queryWrapper 条件 - * @return 结果 - */ - Page selectDefinitionList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - -} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index 0562e688b..ed56ea1f3 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; @@ -28,7 +27,6 @@ import org.dromara.warm.flow.orm.mapper.FlowDefinitionMapper; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.mapper.FlwDefMapper; import org.dromara.workflow.service.IFlwDefinitionService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -50,7 +48,6 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { private final DefService defService; private final FlowDefinitionMapper flowDefinitionMapper; - private final FlwDefMapper flwDefMapper; private final FlowHisTaskMapper flowHisTaskMapper; private final FlwCategoryMapper flwCategoryMapper; @@ -63,16 +60,13 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { */ @Override public TableDataInfo queryList(FlowDefinition flowDefinition, PageQuery pageQuery) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowCode()), "flow_code", flowDefinition.getFlowCode()); - queryWrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowName()), "flow_Name", flowDefinition.getFlowName()); - if (StringUtils.isNotBlank(flowDefinition.getCategory())) { - List categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowDefinition.getCategory())); - queryWrapper.in("category", categoryIds); - } - queryWrapper.orderByDesc("create_time"); - Page page = flwDefMapper.selectDefinitionList(pageQuery.build(), queryWrapper); - return TableDataInfo.build(page); + LambdaQueryWrapper wrapper = buildQueryWrapper(flowDefinition); + wrapper.eq(FlowDefinition::getIsPublish, PublishStatus.PUBLISHED.getKey()); + Page page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper); + TableDataInfo build = TableDataInfo.build(); + build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class)); + build.setTotal(page.getTotal()); + return build; } /** @@ -84,21 +78,25 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { */ @Override public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { + LambdaQueryWrapper wrapper = buildQueryWrapper(flowDefinition); + wrapper.in(FlowDefinition::getIsPublish, Arrays.asList(PublishStatus.UNPUBLISHED.getKey(), PublishStatus.EXPIRED.getKey())); + Page page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper); + TableDataInfo build = TableDataInfo.build(); + build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class)); + build.setTotal(page.getTotal()); + return build; + } + + private LambdaQueryWrapper buildQueryWrapper(FlowDefinition flowDefinition) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowCode()), FlowDefinition::getFlowCode, flowDefinition.getFlowCode()); wrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowName()), FlowDefinition::getFlowName, flowDefinition.getFlowName()); - wrapper.in(FlowDefinition::getIsPublish, Arrays.asList(PublishStatus.UNPUBLISHED.getKey(), PublishStatus.EXPIRED.getKey())); if (StringUtils.isNotBlank(flowDefinition.getCategory())) { List categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowDefinition.getCategory())); wrapper.in(FlowDefinition::getCategory, categoryIds); } wrapper.orderByDesc(FlowDefinition::getCreateTime); - Page page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper); - List records = page.getRecords(); - TableDataInfo build = TableDataInfo.build(); - build.setRows(BeanUtil.copyToList(records, FlowDefinitionVo.class)); - build.setTotal(page.getTotal()); - return build; + return wrapper; } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml deleted file mode 100644 index d5204717c..000000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - -