From 3475d38ff30308080133c8c35a280f47a1ce995c Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sat, 28 Dec 2024 19:34:34 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwDefinitionController.java | 12 ++++---- .../service/IFlwDefinitionService.java | 9 +++--- .../impl/FlwDefinitionServiceImpl.java | 30 ++++++++++++++----- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index d9c889f89..544edd0a7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -40,6 +40,7 @@ public class FlwDefinitionController extends BaseController { * 查询流程定义列表 * * @param flowDefinition 参数 + * @param pageQuery 分页 */ @GetMapping("/list") public TableDataInfo list(FlowDefinition flowDefinition, PageQuery pageQuery) { @@ -47,13 +48,14 @@ public class FlwDefinitionController extends BaseController { } /** - * 获取历史流程定义列表 + * 查询未发布的流程定义列表 * - * @param flowCode 参数 + * @param flowDefinition 参数 + * @param pageQuery 分页 */ - @GetMapping("/getHisListByKey/{flowCode}") - public R> getHisListByKey(@PathVariable String flowCode) { - return R.ok(flwDefinitionService.getHisListByKey(flowCode)); + @GetMapping("/unPublishList") + public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { + return flwDefinitionService.unPublishList(flowDefinition, pageQuery); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java index 08d3aba92..85f23af00 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java @@ -27,12 +27,13 @@ public interface IFlwDefinitionService { TableDataInfo queryList(FlowDefinition flowDefinition, PageQuery pageQuery); /** - * 获取历史流程定义列表 + * 查询未发布的流程定义列表 * - * @param flowCode 参数 - * @return 返回列表 + * @param flowDefinition 参数 + * @param pageQuery 分页 + * @return 返回分页列表 */ - List getHisListByKey(String flowCode); + TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery); /** * 导出流程定义 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 d1ccbbedf..0562e688b 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 @@ -20,6 +20,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.warm.flow.core.dto.FlowCombine; import org.dromara.warm.flow.core.entity.Definition; +import org.dromara.warm.flow.core.enums.PublishStatus; import org.dromara.warm.flow.core.service.DefService; import org.dromara.warm.flow.orm.entity.FlowDefinition; import org.dromara.warm.flow.orm.entity.FlowHisTask; @@ -34,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.Arrays; import java.util.List; /** @@ -56,6 +58,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { * 查询流程定义列表 * * @param flowDefinition 流程定义信息 + * @param pageQuery 分页 * @return 返回分页列表 */ @Override @@ -73,16 +76,29 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { } /** - * 获取历史流程定义列表 + * 查询未发布的流程定义列表 * - * @param flowCode 参数 + * @param flowDefinition 流程定义信息 + * @param pageQuery 分页 + * @return 返回分页列表 */ @Override - public List getHisListByKey(String flowCode) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(FlowDefinition::getFlowCode, flowCode); - List list = flowDefinitionMapper.selectList(wrapper); - return BeanUtil.copyToList(list, FlowDefinitionVo.class); + public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { + 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; } /**