From acda4fb4ba9207f36039cb05bfd3c8fd8b8fcff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sat, 24 Feb 2024 12:36:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlowDefinitionController.java | 18 ++++---- .../controller/FlowInstanceController.java | 2 +- .../controller/FlowTaskController.java | 6 +-- .../domain/{dto => }/FlowSaveXmlVo.java | 2 +- .../service/IFlowDefinitionService.java | 7 ++-- .../service/IFlowInstanceService.java | 2 +- .../flowable/service/IFlowTaskService.java | 4 +- .../impl/FlowDefinitionServiceImpl.java | 38 ++++------------- .../service/impl/FlowInstanceServiceImpl.java | 2 +- .../service/impl/FlowTaskServiceImpl.java | 12 +++--- .../yanzhu/system/domain/FlowProcDefDto.java | 5 +++ .../system/domain/flowable}/FlowQueryVo.java | 10 ++++- .../system/domain/flowable}/FlowTaskVo.java | 2 +- .../domain/flowable}/ReturnTaskNodeVo.java | 2 +- .../domain/flowable}/dto/FlowCommentDto.java | 2 +- .../flowable}/dto/FlowFromFieldDTO.java | 2 +- .../domain/flowable}/dto/FlowNextDto.java | 2 +- .../domain/flowable}/dto/FlowTaskDto.java | 2 +- .../domain/flowable}/dto/FlowViewerDto.java | 2 +- .../system/mapper/FlowDeployMapper.java | 6 ++- .../mapper/flowable/FlowDeployMapper.xml | 41 ++++++++++++------- 21 files changed, 86 insertions(+), 83 deletions(-) rename yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/{dto => }/FlowSaveXmlVo.java (89%) rename {yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo => yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable}/FlowQueryVo.java (71%) rename {yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo => yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable}/FlowTaskVo.java (96%) rename {yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo => yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable}/ReturnTaskNodeVo.java (89%) rename {yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain => yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable}/dto/FlowCommentDto.java (88%) rename {yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain => yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable}/dto/FlowFromFieldDTO.java (80%) rename {yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain => yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable}/dto/FlowNextDto.java (84%) rename {yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain => yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable}/dto/FlowTaskDto.java (98%) rename {yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain => yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable}/dto/FlowViewerDto.java (86%) diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java index 54faac5..d518259 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java @@ -4,7 +4,8 @@ import com.yanzhu.common.core.controller.BaseController; import com.yanzhu.common.core.domain.AjaxResult; import com.yanzhu.common.core.domain.entity.SysRole; import com.yanzhu.common.core.domain.entity.SysUser; -import com.yanzhu.flowable.domain.dto.FlowSaveXmlVo; +import com.yanzhu.flowable.domain.FlowSaveXmlVo; +import com.yanzhu.system.domain.flowable.FlowQueryVo; import com.yanzhu.flowable.service.IFlowDefinitionService; import com.yanzhu.system.domain.FlowProcDefDto; import com.yanzhu.system.domain.SysExpression; @@ -56,15 +57,18 @@ public class FlowDefinitionController extends BaseController { @Resource private ISysExpressionService sysExpressionService; + /** + * 流程定义列表 + * + * @param flowQueryVo 流程查询 + * @return 流程定义分页列表数据 + */ @GetMapping(value = "/list") @ApiOperation(value = "流程定义列表", response = FlowProcDefDto.class) - public AjaxResult list(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum, - @ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize, - @ApiParam(value = "流程名称", required = false) @RequestParam(required = false) String name) { - return AjaxResult.success(flowDefinitionService.list(name, pageNum, pageSize)); + public AjaxResult list(FlowQueryVo flowQueryVo) { + return AjaxResult.success(flowDefinitionService.list(flowQueryVo)); } - @ApiOperation(value = "导入流程文件", notes = "上传bpmn20的xml文件") @PostMapping("/import") public AjaxResult importFile(@RequestParam(required = false) String name, @@ -90,7 +94,6 @@ public class FlowDefinitionController extends BaseController { return AjaxResult.success("导入成功"); } - @ApiOperation(value = "读取xml文件") @GetMapping("/readXml/{deployId}") public AjaxResult readXml(@ApiParam(value = "流程定义id") @PathVariable(value = "deployId") String deployId) { @@ -129,7 +132,6 @@ public class FlowDefinitionController extends BaseController { } - @ApiOperation(value = "保存流程设计器内的xml文件") @PostMapping("/save") public AjaxResult save(@RequestBody FlowSaveXmlVo vo) { diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowInstanceController.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowInstanceController.java index d95a615..3e73344 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowInstanceController.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowInstanceController.java @@ -2,7 +2,7 @@ package com.yanzhu.flowable.controller; import com.yanzhu.common.core.domain.AjaxResult; -import com.yanzhu.flowable.domain.vo.FlowTaskVo; +import com.yanzhu.system.domain.flowable.FlowTaskVo; import com.yanzhu.flowable.service.IFlowInstanceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java index 1d0a647..aab3e99 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java @@ -1,9 +1,9 @@ package com.yanzhu.flowable.controller; import com.yanzhu.common.core.domain.AjaxResult; -import com.yanzhu.flowable.domain.dto.FlowTaskDto; -import com.yanzhu.flowable.domain.vo.FlowQueryVo; -import com.yanzhu.flowable.domain.vo.FlowTaskVo; +import com.yanzhu.system.domain.flowable.dto.FlowTaskDto; +import com.yanzhu.system.domain.flowable.FlowQueryVo; +import com.yanzhu.system.domain.flowable.FlowTaskVo; import com.yanzhu.flowable.service.IFlowTaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowSaveXmlVo.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowSaveXmlVo.java similarity index 89% rename from yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowSaveXmlVo.java rename to yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowSaveXmlVo.java index 0031189..d267fb3 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowSaveXmlVo.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowSaveXmlVo.java @@ -1,4 +1,4 @@ -package com.yanzhu.flowable.domain.dto; +package com.yanzhu.flowable.domain; import lombok.Data; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowDefinitionService.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowDefinitionService.java index 1eeef61..11bc7bd 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowDefinitionService.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowDefinitionService.java @@ -2,6 +2,7 @@ package com.yanzhu.flowable.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yanzhu.common.core.domain.AjaxResult; +import com.yanzhu.system.domain.flowable.FlowQueryVo; import com.yanzhu.system.domain.FlowProcDefDto; import java.io.IOException; @@ -16,15 +17,13 @@ public interface IFlowDefinitionService { boolean exist(String processDefinitionKey); - /** * 流程定义列表 * - * @param pageNum 当前页码 - * @param pageSize 每页条数 + * @param flowQueryVo 流程查询 * @return 流程定义分页列表数据 */ - Page list(String name,Integer pageNum, Integer pageSize); + Page list(FlowQueryVo flowQueryVo); /** * 导入流程文件 diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowInstanceService.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowInstanceService.java index bf9b8a7..9024181 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowInstanceService.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowInstanceService.java @@ -1,7 +1,7 @@ package com.yanzhu.flowable.service; import com.yanzhu.common.core.domain.AjaxResult; -import com.yanzhu.flowable.domain.vo.FlowTaskVo; +import com.yanzhu.system.domain.flowable.FlowTaskVo; import org.flowable.engine.history.HistoricProcessInstance; import java.util.Map; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowTaskService.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowTaskService.java index d721f5b..10f412d 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowTaskService.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowTaskService.java @@ -1,8 +1,8 @@ package com.yanzhu.flowable.service; import com.yanzhu.common.core.domain.AjaxResult; -import com.yanzhu.flowable.domain.vo.FlowQueryVo; -import com.yanzhu.flowable.domain.vo.FlowTaskVo; +import com.yanzhu.system.domain.flowable.FlowQueryVo; +import com.yanzhu.system.domain.flowable.FlowTaskVo; import org.flowable.task.api.Task; import java.io.InputStream; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowDefinitionServiceImpl.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowDefinitionServiceImpl.java index 2a48ce7..ae3c064 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowDefinitionServiceImpl.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowDefinitionServiceImpl.java @@ -7,6 +7,7 @@ import com.yanzhu.flowable.common.constant.ProcessConstants; import com.yanzhu.common.core.domain.AjaxResult; import com.yanzhu.common.core.domain.entity.SysUser; import com.yanzhu.common.utils.SecurityUtils; +import com.yanzhu.system.domain.flowable.FlowQueryVo; import com.yanzhu.system.domain.FlowProcDefDto; import com.yanzhu.flowable.factory.FlowServiceFactory; import com.yanzhu.flowable.service.IFlowDefinitionService; @@ -70,47 +71,22 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl /** * 流程定义列表 * - * @param pageNum 当前页码 - * @param pageSize 每页条数 + * @param flowQueryVo 流程查询 * @return 流程定义分页列表数据 */ @Override - public Page list(String name, Integer pageNum, Integer pageSize) { + public Page list(FlowQueryVo flowQueryVo) { Page page = new Page<>(); -// // 流程定义列表数据查询 -// final ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery(); -// if (StringUtils.isNotEmpty(name)) { -// processDefinitionQuery.processDefinitionNameLike(name); -// } -//// processDefinitionQuery.orderByProcessDefinitionKey().asc(); -// page.setTotal(processDefinitionQuery.count()); -// List processDefinitionList = processDefinitionQuery.listPage(pageSize * (pageNum - 1), pageSize); -// -// List dataList = new ArrayList<>(); -// for (ProcessDefinition processDefinition : processDefinitionList) { -// String deploymentId = processDefinition.getDeploymentId(); -// Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(deploymentId).singleResult(); -// FlowProcDefDto reProcDef = new FlowProcDefDto(); -// BeanUtils.copyProperties(processDefinition, reProcDef); -// SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(deploymentId); -// if (Objects.nonNull(sysForm)) { -// reProcDef.setFormName(sysForm.getFormName()); -// reProcDef.setFormId(sysForm.getFormId()); -// } -// // 流程定义时间 -// reProcDef.setDeploymentTime(deployment.getDeploymentTime()); -// dataList.add(reProcDef); -// } - PageHelper.startPage(pageNum, pageSize); - final List dataList = flowDeployMapper.selectDeployList(name); + PageHelper.startPage(flowQueryVo.getPageNum(), flowQueryVo.getPageSize()); + final List dataList = flowDeployMapper.selectDeployList(flowQueryVo); // 加载挂表单 - for (FlowProcDefDto procDef : dataList) { + /**for (FlowProcDefDto procDef : dataList) { SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(procDef.getDeploymentId()); if (Objects.nonNull(sysForm)) { procDef.setFormName(sysForm.getFormName()); procDef.setFormId(sysForm.getFormId()); } - } + }*/ page.setTotal(new PageInfo(dataList).getTotal()); page.setRecords(dataList); return page; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowInstanceServiceImpl.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowInstanceServiceImpl.java index 69c1187..65e2d19 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowInstanceServiceImpl.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowInstanceServiceImpl.java @@ -3,7 +3,7 @@ package com.yanzhu.flowable.service.impl; import com.yanzhu.common.core.domain.AjaxResult; import com.yanzhu.common.utils.SecurityUtils; -import com.yanzhu.flowable.domain.vo.FlowTaskVo; +import com.yanzhu.system.domain.flowable.FlowTaskVo; import com.yanzhu.flowable.factory.FlowServiceFactory; import com.yanzhu.flowable.service.IFlowInstanceService; import lombok.extern.slf4j.Slf4j; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java index cd26050..29aa232 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java @@ -12,12 +12,12 @@ import com.yanzhu.common.core.domain.entity.SysUser; import com.yanzhu.flowable.common.enums.FlowComment; import com.yanzhu.common.exception.CustomException; import com.yanzhu.common.utils.SecurityUtils; -import com.yanzhu.flowable.domain.dto.FlowCommentDto; -import com.yanzhu.flowable.domain.dto.FlowNextDto; -import com.yanzhu.flowable.domain.dto.FlowTaskDto; -import com.yanzhu.flowable.domain.dto.FlowViewerDto; -import com.yanzhu.flowable.domain.vo.FlowQueryVo; -import com.yanzhu.flowable.domain.vo.FlowTaskVo; +import com.yanzhu.system.domain.flowable.dto.FlowCommentDto; +import com.yanzhu.system.domain.flowable.dto.FlowNextDto; +import com.yanzhu.system.domain.flowable.dto.FlowTaskDto; +import com.yanzhu.system.domain.flowable.dto.FlowViewerDto; +import com.yanzhu.system.domain.flowable.FlowQueryVo; +import com.yanzhu.system.domain.flowable.FlowTaskVo; import com.yanzhu.flowable.factory.FlowServiceFactory; import com.yanzhu.flowable.flow.CustomProcessDiagramGenerator; import com.yanzhu.flowable.flow.FindNextNodeUtil; diff --git a/yanzhu-system/src/main/java/com/yanzhu/system/domain/FlowProcDefDto.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/FlowProcDefDto.java index abff8c2..99a57ff 100644 --- a/yanzhu-system/src/main/java/com/yanzhu/system/domain/FlowProcDefDto.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/FlowProcDefDto.java @@ -52,5 +52,10 @@ public class FlowProcDefDto implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date deploymentTime; + @ApiModelProperty("单位主键") + private Long deptId; + + @ApiModelProperty("单位名称") + private String deptName; } diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo/FlowQueryVo.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/FlowQueryVo.java similarity index 71% rename from yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo/FlowQueryVo.java rename to yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/FlowQueryVo.java index 25eb4aa..2e20644 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo/FlowQueryVo.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/FlowQueryVo.java @@ -1,4 +1,4 @@ -package com.yanzhu.flowable.domain.vo; +package com.yanzhu.system.domain.flowable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -29,5 +29,13 @@ public class FlowQueryVo { @ApiModelProperty("每页条数") private Integer pageSize; + @ApiModelProperty("流程类型") + private String category; + + @ApiModelProperty("单位主键") + private Long deptId; + + @ApiModelProperty("单位名称") + private String deptName; } diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo/FlowTaskVo.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/FlowTaskVo.java similarity index 96% rename from yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo/FlowTaskVo.java rename to yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/FlowTaskVo.java index dcca168..79d6c38 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo/FlowTaskVo.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/FlowTaskVo.java @@ -1,4 +1,4 @@ -package com.yanzhu.flowable.domain.vo; +package com.yanzhu.system.domain.flowable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo/ReturnTaskNodeVo.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/ReturnTaskNodeVo.java similarity index 89% rename from yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo/ReturnTaskNodeVo.java rename to yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/ReturnTaskNodeVo.java index 0085e54..0995ced 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/vo/ReturnTaskNodeVo.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/ReturnTaskNodeVo.java @@ -1,4 +1,4 @@ -package com.yanzhu.flowable.domain.vo; +package com.yanzhu.system.domain.flowable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowCommentDto.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowCommentDto.java similarity index 88% rename from yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowCommentDto.java rename to yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowCommentDto.java index df35522..7f8f552 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowCommentDto.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowCommentDto.java @@ -1,4 +1,4 @@ -package com.yanzhu.flowable.domain.dto; +package com.yanzhu.system.domain.flowable.dto; import lombok.Builder; import lombok.Data; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowFromFieldDTO.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowFromFieldDTO.java similarity index 80% rename from yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowFromFieldDTO.java rename to yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowFromFieldDTO.java index ab8c76b..372cb98 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowFromFieldDTO.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowFromFieldDTO.java @@ -1,4 +1,4 @@ -package com.yanzhu.flowable.domain.dto; +package com.yanzhu.system.domain.flowable.dto; import lombok.Data; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowNextDto.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowNextDto.java similarity index 84% rename from yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowNextDto.java rename to yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowNextDto.java index 01a97e9..f46826c 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowNextDto.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowNextDto.java @@ -1,4 +1,4 @@ -package com.yanzhu.flowable.domain.dto; +package com.yanzhu.system.domain.flowable.dto; import lombok.Data; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowTaskDto.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowTaskDto.java similarity index 98% rename from yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowTaskDto.java rename to yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowTaskDto.java index a7d7cfa..89fa539 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowTaskDto.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowTaskDto.java @@ -1,4 +1,4 @@ -package com.yanzhu.flowable.domain.dto; +package com.yanzhu.system.domain.flowable.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowViewerDto.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowViewerDto.java similarity index 86% rename from yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowViewerDto.java rename to yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowViewerDto.java index 8f01f93..efd1539 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/dto/FlowViewerDto.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowViewerDto.java @@ -1,4 +1,4 @@ -package com.yanzhu.flowable.domain.dto; +package com.yanzhu.system.domain.flowable.dto; import lombok.Data; diff --git a/yanzhu-system/src/main/java/com/yanzhu/system/mapper/FlowDeployMapper.java b/yanzhu-system/src/main/java/com/yanzhu/system/mapper/FlowDeployMapper.java index 6e2a6fd..5997a74 100644 --- a/yanzhu-system/src/main/java/com/yanzhu/system/mapper/FlowDeployMapper.java +++ b/yanzhu-system/src/main/java/com/yanzhu/system/mapper/FlowDeployMapper.java @@ -1,6 +1,8 @@ package com.yanzhu.system.mapper; import com.yanzhu.system.domain.FlowProcDefDto; +import com.yanzhu.system.domain.flowable.FlowQueryVo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,8 +17,8 @@ public interface FlowDeployMapper { /** * 流程定义列表 - * @param name + * @param flowQueryVo 流程查询 * @return */ - List selectDeployList(String name); + List selectDeployList(FlowQueryVo flowQueryVo); } diff --git a/yanzhu-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml b/yanzhu-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml index 24e5336..b6f302f 100644 --- a/yanzhu-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml +++ b/yanzhu-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml @@ -3,28 +3,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - SELECT - rp.id_ as id, - rp.deployment_id_ as deploymentId, - rd.name_ as name, - rd.category_ as category, - rp.key_ as flowKey, - rp.version_ as version, - rp.suspension_state_ as suspensionState, - rd.deploy_time_ as deploymentTime + rp.id_ as id, + rp.deployment_id_ as deploymentId, + rd.name_ as name, + rd.category_ as category, + rp.key_ as flowKey, + rp.version_ as version, + rp.suspension_state_ as suspensionState, + rd.deploy_time_ as deploymentTime, + rpd.DEPT_ID_ as deptId, + sd.dept_name as deptName FROM - act_re_procdef rp - LEFT JOIN act_re_deployment rd ON rp.deployment_id_ = rd.id_ + act_re_procdef rp + LEFT JOIN act_re_deployment rd ON rp.deployment_id_ = rd.id_ + left join act_re_procdef_dept rpd on rp.id_ = rpd.PROCDEF_ID_ + left join sys_dept sd on sd.dept_id = rpr.DEPT_ID_ + + and rpd.DEPT_ID_ = #{deptId} + + + and sd.dept_name like concat('%', #{deptName}, '%') + - and rd.name_ like concat('%', #{name}, '%') + and rd.name_ like concat('%', #{name}, '%') + + + and rd.category_ = #{category} - order by rd.deploy_time_ desc