From 568ba3dcfe57198a82709fcf59d9f24d309665f3 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Mon, 16 Dec 2024 14:44:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwDefinitionController.java | 16 ++++++++-------- .../dromara/workflow/mapper/FlwDefMapper.java | 2 +- .../workflow/service/IFlwDefinitionService.java | 5 +++-- .../service/impl/FlwDefinitionServiceImpl.java | 14 +++++++------- .../resources/mapper/workflow/FlwDefMapper.xml | 3 ++- 5 files changed, 21 insertions(+), 19 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 5e33f639b..092eb0d5a 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 @@ -36,17 +36,17 @@ import java.util.List; public class FlwDefinitionController extends BaseController { private final IFlwCategoryService flwCategoryService; - private final IFlwDefinitionService iFlwDefinitionService; + private final IFlwDefinitionService flwDefinitionService; private final DefService defService; /** - * 分页查询 + * 查询流程定义列表 * * @param flowDefinition 参数 */ @GetMapping("/list") - public TableDataInfo page(FlowDefinition flowDefinition, PageQuery pageQuery) { - return iFlwDefinitionService.page(flowDefinition, pageQuery); + public TableDataInfo list(FlowDefinition flowDefinition, PageQuery pageQuery) { + return flwDefinitionService.queryList(flowDefinition, pageQuery); } /** @@ -64,7 +64,7 @@ public class FlwDefinitionController extends BaseController { */ @GetMapping("/getHisListByKey/{flowCode}") public R> getHisListByKey(@PathVariable String flowCode) { - return R.ok(iFlwDefinitionService.getHisListByKey(flowCode)); + return R.ok(flwDefinitionService.getHisListByKey(flowCode)); } /** @@ -132,7 +132,7 @@ public class FlwDefinitionController extends BaseController { @DeleteMapping("/{ids}") @Transactional(rollbackFor = Exception.class) public R remove(@PathVariable List ids) { - return toAjax(iFlwDefinitionService.removeDef(ids)); + return toAjax(flwDefinitionService.removeDef(ids)); } /** @@ -156,7 +156,7 @@ public class FlwDefinitionController extends BaseController { @PostMapping("/importDef") @Transactional(rollbackFor = Exception.class) public R importDef(MultipartFile file, String category) { - return R.ok(iFlwDefinitionService.importXml(file, category)); + return R.ok(flwDefinitionService.importXml(file, category)); } /** @@ -169,7 +169,7 @@ public class FlwDefinitionController extends BaseController { @Log(title = "流程定义", businessType = BusinessType.EXPORT) @PostMapping("/exportDef/{id}") public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException { - iFlwDefinitionService.exportDef(id, response); + flwDefinitionService.exportDef(id, response); } /** 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 index d3608bd41..9b9af2a2e 100644 --- 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 @@ -21,6 +21,6 @@ public interface FlwDefMapper { * @param queryWrapper 条件 * @return 结果 */ - Page page(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + 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/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java index 9141bbfa1..08d3aba92 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 @@ -16,14 +16,15 @@ import java.util.List; * @author may */ public interface IFlwDefinitionService { + /** - * 分页查询 + * 查询流程定义列表 * * @param flowDefinition 参数 * @param pageQuery 分页 * @return 返回分页列表 */ - TableDataInfo page(FlowDefinition flowDefinition, PageQuery pageQuery); + TableDataInfo queryList(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 c2bcece55..ce4fa621d 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 @@ -53,19 +53,19 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { private final FlowHisTaskMapper flowHisTaskMapper; /** - * 分页查询 + * 查询流程定义列表 * - * @param flowDefinition 参数 + * @param flowDefinition 流程定义信息 * @return 返回分页列表 */ @Override - public TableDataInfo page(FlowDefinition flowDefinition, PageQuery pageQuery) { + 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()); - queryWrapper.eq(StringUtils.isNotBlank(flowDefinition.getCategory()),"category", flowDefinition.getCategory()); + queryWrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowCode()), "flow_code", flowDefinition.getFlowCode()); + queryWrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowName()), "flow_Name", flowDefinition.getFlowName()); + queryWrapper.eq(StringUtils.isNotBlank(flowDefinition.getCategory()), "category", flowDefinition.getCategory()); queryWrapper.orderByDesc("create_time"); - Page page = flwDefMapper.page(pageQuery.build(), queryWrapper); + Page page = flwDefMapper.selectDefinitionList(pageQuery.build(), queryWrapper); TableDataInfo build = TableDataInfo.build(); build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class)); build.setTotal(page.getTotal()); 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 index b965b13ff..64c99b485 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml @@ -3,7 +3,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select * from ( select a.*