From 5f071c85317511d635cd0a94995d1bf3b3a92140 Mon Sep 17 00:00:00 2001 From: liyang Date: Thu, 12 Dec 2024 12:27:22 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E5=A2=9E=E5=8A=A0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BA=BA=E5=8F=8A=E7=94=B3=E8=AF=B7=E4=BA=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20[fix]=20=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E3=80=81=E5=B7=B2=E5=AE=8C=E6=88=90=E5=AE=9E=E4=BE=8B=E6=9F=A5?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwInstanceController.java | 13 ++++++------- .../workflow/domain/bo/FlowInstanceBo.java | 11 +++++++++++ .../dromara/workflow/domain/bo/FlowTaskBo.java | 4 ++++ .../workflow/domain/vo/FlowHisTaskVo.java | 5 ++++- .../workflow/domain/vo/FlowInstanceVo.java | 4 ++++ .../dromara/workflow/domain/vo/FlowTaskVo.java | 8 ++++++++ .../workflow/service/IFlwInstanceService.java | 5 ++--- .../service/impl/FlwInstanceServiceImpl.java | 16 ++++++++++++---- .../service/impl/FlwTaskServiceImpl.java | 3 ++- .../mapper/workflow/FlwInstanceMapper.xml | 13 ++++++++++--- .../resources/mapper/workflow/FlwTaskMapper.xml | 13 +++++++++++-- 11 files changed, 74 insertions(+), 21 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index d446bae9e..2f58baf1d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -8,7 +8,6 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; -import org.dromara.warm.flow.core.entity.Instance; import org.dromara.warm.flow.core.service.InsService; import org.dromara.workflow.domain.bo.FlowCancelBo; import org.dromara.workflow.domain.bo.FlowInstanceBo; @@ -37,23 +36,23 @@ public class FlwInstanceController extends BaseController { /** * 分页查询正在运行的流程实例 * - * @param instance 参数 + * @param flowInstanceBo 参数 * @param pageQuery 分页 */ @GetMapping("/pageByRunning") - public TableDataInfo pageByRunning(Instance instance, PageQuery pageQuery) { - return flwInstanceService.pageByRunning(instance, pageQuery); + public TableDataInfo pageByRunning(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return flwInstanceService.pageByRunning(flowInstanceBo, pageQuery); } /** * 分页查询已结束的流程实例 * - * @param instance 参数 + * @param flowInstanceBo 参数 * @param pageQuery 分页 */ @GetMapping("/pageByFinish") - public TableDataInfo pageByFinish(Instance instance, PageQuery pageQuery) { - return flwInstanceService.pageByFinish(instance, pageQuery); + public TableDataInfo pageByFinish(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return flwInstanceService.pageByFinish(flowInstanceBo, pageQuery); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java index 6d59292f3..7bbee5439 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java @@ -40,4 +40,15 @@ public class FlowInstanceBo implements Serializable { * 模型分类 */ private String categoryCode; + + /** + * 任务名称 + */ + private String nodeName; + + + /** + * 申请人 + */ + private String nickName; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java index 66dc70a61..e6e072029 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java @@ -41,4 +41,8 @@ public class FlowTaskBo implements Serializable { * 权限列表 */ private List permissionList; + /** + * 申请人 + */ + private String nickName; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java index e27f61eb7..d2a2ef92b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java @@ -223,5 +223,8 @@ public class FlowHisTaskVo implements Serializable { this.cooperateType = cooperateType; this.cooperateTypeName = CooperateType.getValueByKey(cooperateType); } - + /** + * 创建者昵称 + */ + private String nickName; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java index a8a85fb51..4a05b36b0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java @@ -113,4 +113,8 @@ public class FlowInstanceVo { * 流程定义版本 */ private String version; + /** + * 创建者昵称 + */ + private String nickName; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java index e60cd0b54..75407b3ad 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java @@ -140,4 +140,12 @@ public class FlowTaskVo implements Serializable { * 流程签署比例值 大于0为票签，会签 */ private BigDecimal nodeRatio; + /** + * 创建者 + */ + private String createBy; + /** + * 创建者昵称 + */ + private String nickName; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java index f3834bf02..3022745cb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java @@ -2,7 +2,6 @@ package org.dromara.workflow.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.warm.flow.core.entity.Instance; import org.dromara.warm.flow.orm.entity.FlowInstance; import org.dromara.workflow.domain.bo.FlowCancelBo; import org.dromara.workflow.domain.bo.FlowInstanceBo; @@ -26,7 +25,7 @@ public interface IFlwInstanceService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo pageByRunning(Instance instance, PageQuery pageQuery); + TableDataInfo pageByRunning(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); /** * 分页查询已结束的流程实例 @@ -35,7 +34,7 @@ public interface IFlwInstanceService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo pageByFinish(Instance instance, PageQuery pageQuery); + TableDataInfo pageByFinish(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); /** * 按照业务id查询流程实例 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 3ebef57bc..dfb60f778 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -76,13 +76,17 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { /** * 分页查询正在运行的流程实例 * - * @param instance 参数 + * @param flowInstanceBo 参数 * @param pageQuery 分页 */ @Override - public TableDataInfo pageByRunning(Instance instance, PageQuery pageQuery) { + public TableDataInfo pageByRunning(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("fi.flow_status", BusinessStatusEnum.runningStatus()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getNodeName()), "fi.node_name", flowInstanceBo.getNodeName()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowName()), "fd.flow_name", flowInstanceBo.getFlowName()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowCode()), "fd.flow_code", flowInstanceBo.getFlowCode()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getNickName()), "su.nick_name", flowInstanceBo.getNickName()); Page page = flwInstanceMapper.page(pageQuery.build(), queryWrapper); TableDataInfo build = TableDataInfo.build(); build.setRows(BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class)); @@ -93,13 +97,17 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { /** * 分页查询已结束的流程实例 * - * @param instance 参数 + * @param flowInstanceBo 参数 * @param pageQuery 分页 */ @Override - public TableDataInfo pageByFinish(Instance instance, PageQuery pageQuery) { + public TableDataInfo pageByFinish(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("fi.flow_status", BusinessStatusEnum.finishStatus()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getNodeName()), "fi.node_name", flowInstanceBo.getNodeName()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowName()), "fd.flow_name", flowInstanceBo.getFlowName()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowCode()), "fd.flow_code", flowInstanceBo.getFlowCode()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getNickName()), "su.nick_name", flowInstanceBo.getNickName()); Page page = flwInstanceMapper.page(pageQuery.build(), queryWrapper); TableDataInfo build = TableDataInfo.build(); build.setRows(BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class)); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 9e3d907e8..9ac5ee5f4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -325,7 +325,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { QueryWrapper wrapper = Wrappers.query(); wrapper.like(StringUtils.isNotBlank(flowTaskBo.getNodeName()), "t.node_name", flowTaskBo.getNodeName()); wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName()); - wrapper.eq(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode()); + wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode()); + wrapper.like(StringUtils.isNotBlank(flowTaskBo.getNickName()), "t.nick_name", flowTaskBo.getNickName()); wrapper.orderByDesc("t.create_time"); return wrapper; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml index a7f7a7022..47782d717 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml @@ -21,6 +21,8 @@ + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml index be7ccc31d..6c113a83e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml @@ -21,6 +21,8 @@ + + @@ -68,14 +70,17 @@ d.form_path, d.version, uu.processed_by, - uu.type + uu.type, + su.nick_name from flow_task as t left join flow_user uu on uu.associated = t.id left join flow_definition d on t.definition_id = d.id left join flow_instance i on t.instance_id = i.id + left join sys_user su on i.create_by = su.user_id where t.node_type = 1 and t.del_flag = '0' and uu.del_flag = '0' + and su.del_flag ='0' and uu.type in ('1','2','3') ) t ${ew.getCustomSqlSegment} @@ -106,13 +111,17 @@ c.form_path, c.flow_name, c.flow_code, - c.version + c.version, + b.create_by, + su.nick_name from flow_his_task a left join flow_instance b on a.instance_id = b.id left join flow_definition c on a.definition_id = c.id + left join sys_user su on b.create_by = su.user_id where a.del_flag ='0' and b.del_flag = '0' and c.del_flag = '0' + and su.del_flag ='0' and a.node_type in ('1','3','4') ) t ${ew.getCustomSqlSegment}