From 4f3a66b21ce9776d7a2f666e2ac8945bb4f358c6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 5 Jun 2024 10:29:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BE=85=E5=8A=9E/=E5=B7=B2=E5=8F=91/?= =?UTF-8?q?=E5=B7=B2=E5=8A=9E/=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E8=B5=B7=E4=BA=BA=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/controller/WorkCenterController.java | 7 +++++-- .../jero/modules/activiti/mapper/xml/ProcessAllMapper.xml | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java index ce38e5a9..30bb64bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -67,6 +68,7 @@ public class WorkCenterController { queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.COMPLETED.getValue()); + queryWrapper.like(StrUtil.isNotBlank(processAll.getCreateUserName()),"CONCAT(u.realname, '(', u.username, ')')", processAll.getCreateUserName()); Page page = new Page<>(pageNo, pageSize); IPage todoList = processAllService.getTodoList(page, queryWrapper, req); @@ -85,6 +87,7 @@ public class WorkCenterController { queryWrapper.eq("par.user_id",userId); queryWrapper.eq("par.finish_flag",FinishFlagEnum.COMPLETE.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); + queryWrapper.like(StrUtil.isNotBlank(processAll.getCreateUserName()),"CONCAT(u.realname, '(', u.username, ')')", processAll.getCreateUserName()); Page page = new Page<>(pageNo, pageSize); IPage completedList = processAllService.getCompletedList(page, queryWrapper, req); return Result.OK(completedList); @@ -101,7 +104,7 @@ public class WorkCenterController { String userId = loginUser.getId(); queryWrapper.eq("pa.create_user_id",userId); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); - + queryWrapper.like(StrUtil.isNotBlank(processAll.getCreateUserName()),"CONCAT(u.realname, '(', u.username, ')')", processAll.getCreateUserName()); Page page = new Page<>(pageNo, pageSize); IPage sentList = processAllService.getSentList(page, queryWrapper, req); return Result.OK(sentList); @@ -114,7 +117,7 @@ public class WorkCenterController { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll, true); - + queryWrapper.like(StrUtil.isNotBlank(processAll.getCreateUserName()),"CONCAT(u.realname, '(', u.username, ')')", processAll.getCreateUserName()); Page page = new Page<>(pageNo, pageSize); IPage sentList = processAllService.getAllList(page, queryWrapper, req); return Result.OK(sentList); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml index b86df78f..e5f4ccf0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml @@ -48,6 +48,7 @@ pa.project_id from process_approval_record par left join process_all pa on pa.process_instance_id = par.process_instance_id + left join sys_user u on u.id = pa.create_user_id ${ew.customSqlSegment} @@ -69,6 +70,7 @@ pa.completed_task_time from process_all pa left join process_approval_record par on pa.process_instance_id = par.process_instance_id + left join sys_user u on u.id = pa.create_user_id ${ew.customSqlSegment} @@ -89,6 +91,7 @@ pa.received_task_time, pa.completed_task_time from process_all pa + left join sys_user u on u.id = pa.create_user_id ${ew.customSqlSegment} @@ -109,6 +112,7 @@ pa.received_task_time, pa.completed_task_time from process_all pa + left join sys_user u on u.id = pa.create_user_id ${ew.customSqlSegment}