From fa8b450e2cdd5d202f484d1ce239d6a5ab52991b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 12 Jan 2024 11:16:08 +0800 Subject: [PATCH] =?UTF-8?q?fix=2079296=20=E6=B5=81=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E6=8E=92=E5=BA=8F=E9=83=BD=E6=98=AF=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=97=B6=E9=97=B4=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=88=97?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E5=BB=BA=E8=AE=AE=E5=80=92=E5=BA=8F=E6=8E=92?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkCenterController.java | 22 +++++++------- .../activiti/mapper/ProcessAllMapper.java | 8 ++--- .../activiti/mapper/xml/ProcessAllMapper.xml | 16 ++++++++-- .../activiti/service/ProcessAllService.java | 29 ++++++++++++------- .../home/controller/LawsHomeBacklogTask.java | 6 ++-- 5 files changed, 51 insertions(+), 30 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 af657b67..d890826a 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 @@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Map; +import java.util.Objects; /** * @author liJiaRao @@ -56,7 +57,7 @@ public class WorkCenterController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll); + QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll, false); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = loginUser.getId(); queryWrapper.eq("par.user_id",userId); @@ -64,7 +65,7 @@ public class WorkCenterController { queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); Page page = new Page<>(pageNo, pageSize); - IPage todoList = processAllService.getTodoList(page, queryWrapper); + IPage todoList = processAllService.getTodoList(page, queryWrapper, req); return Result.OK(todoList); } @@ -74,14 +75,14 @@ public class WorkCenterController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll); + QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll,true); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = loginUser.getId(); queryWrapper.eq("par.user_id",userId); queryWrapper.eq("par.finish_flag",FinishFlagEnum.COMPLETE.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); Page page = new Page<>(pageNo, pageSize); - IPage completedList = processAllService.getCompletedList(page, queryWrapper); + IPage completedList = processAllService.getCompletedList(page, queryWrapper, req); return Result.OK(completedList); } @@ -91,14 +92,14 @@ public class WorkCenterController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll); + QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll, true); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = loginUser.getId(); queryWrapper.eq("pa.create_user_id",userId); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); Page page = new Page<>(pageNo, pageSize); - IPage sentList = processAllService.getSentList(page, queryWrapper); + IPage sentList = processAllService.getSentList(page, queryWrapper, req); return Result.OK(sentList); } @@ -108,10 +109,10 @@ public class WorkCenterController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll); + QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll, true); Page page = new Page<>(pageNo, pageSize); - IPage sentList = processAllService.getAllList(page, queryWrapper); + IPage sentList = processAllService.getAllList(page, queryWrapper, req); return Result.OK(sentList); } @@ -148,7 +149,7 @@ public class WorkCenterController { } @NotNull - private QueryWrapper getProcessAllQueryWrapper(ProcessAll processAll) { + private QueryWrapper getProcessAllQueryWrapper(ProcessAll processAll, boolean groupBy) { String prcName = processAll.getPrcName(); String prcNum = processAll.getPrcNum(); Integer prcType = processAll.getPrcType(); @@ -158,8 +159,7 @@ public class WorkCenterController { queryWrapper.like(StringUtils.isNotBlank(prcNum), "pa.prc_num", "%" + prcNum + "%"); queryWrapper.eq(prcType != null, "pa.prc_type", prcType); queryWrapper.eq(prcStatus != null, "pa.prc_status", prcStatus); - - + queryWrapper.groupBy(groupBy, "pa.id"); return queryWrapper; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessAllMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessAllMapper.java index 8b59f312..97c3a57d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessAllMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessAllMapper.java @@ -14,11 +14,11 @@ import org.apache.ibatis.annotations.Param; *@date 2023-10-16 15:49 */ public interface ProcessAllMapper extends BaseMapper { - IPage getTodoList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage getTodoList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("column") String column, @Param("order") String order); - IPage getCompletedList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage getCompletedList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("column") String column, @Param("order") String order); - IPage getSentList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage getSentList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("column") String column, @Param("order") String order); - IPage getAllList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage getAllList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("column") String column, @Param("order") String order); } \ No newline at end of file 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 3421f10c..39ccdd65 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 @@ -1,11 +1,21 @@ + + + + order by receivedTaskTime + + desc + + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 35b7d062..75b4fda3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -35,6 +35,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; @@ -74,16 +75,28 @@ public class ProcessAllService extends ServiceImpl return this.getOne(wrapper); } - public IPage getTodoList(Page page, QueryWrapper queryWrapper) { - return processAllMapper.getTodoList(page,queryWrapper); + public IPage getTodoList(Page page, QueryWrapper queryWrapper, HttpServletRequest req) { + String column = req.getParameter("column"); + String order = req.getParameter("order"); + return processAllMapper.getTodoList(page,queryWrapper,column,order); } - public IPage getCompletedList(Page page, QueryWrapper queryWrapper) { - return processAllMapper.getCompletedList(page,queryWrapper); + public IPage getCompletedList(Page page, QueryWrapper queryWrapper, HttpServletRequest req) { + String column = req.getParameter("column"); + String order = req.getParameter("order"); + return processAllMapper.getCompletedList(page,queryWrapper,column,order); } - public IPage getSentList(Page page, QueryWrapper queryWrapper) { - return processAllMapper.getSentList(page,queryWrapper); + public IPage getSentList(Page page, QueryWrapper queryWrapper, HttpServletRequest req) { + String column = req.getParameter("column"); + String order = req.getParameter("order"); + return processAllMapper.getSentList(page,queryWrapper,column,order); + } + + public IPage getAllList(Page page, QueryWrapper queryWrapper, HttpServletRequest req) { + String column = req.getParameter("column"); + String order = req.getParameter("order"); + return processAllMapper.getAllList(page,queryWrapper,column,order); } @Transactional(rollbackFor = Exception.class) public void forcedWithdrawal(String processInstanceId) { @@ -125,10 +138,6 @@ public class ProcessAllService extends ServiceImpl //todo 同步删除操作到统一待办 } - public IPage getAllList(Page page, QueryWrapper queryWrapper) { - return processAllMapper.getAllList(page,queryWrapper); - } - public void delegateTask(DelegateTaskParam param) { String taskId = param.getTaskId(); String userId = param.getUserId(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeBacklogTask.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeBacklogTask.java index 950a044d..c49aef12 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeBacklogTask.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeBacklogTask.java @@ -28,6 +28,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 待办任务 * @Author: jero-boot @@ -53,7 +55,7 @@ public class LawsHomeBacklogTask { @AutoLog(value = "待办任务-列表查询") @ApiOperation(value="待办任务-列表查询", notes="快捷入口-列表查询") @GetMapping(value = "/queryBacklogTaskList") - public Result> getTodoList(ProcessAll processAll) { + public Result> getTodoList(ProcessAll processAll, HttpServletRequest req) { ProcessAllService processAllService = applicationContext.getBean(ProcessAllService.class); QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -63,7 +65,7 @@ public class LawsHomeBacklogTask { queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); queryWrapper.orderByDesc("pa.create_time"); Page page = new Page<>(1, 10); - return Result.OK(processAllService.getTodoList(page, queryWrapper)); + return Result.OK(processAllService.getTodoList(page, queryWrapper, req)); } private QueryWrapper getProcessAllQueryWrapper(ProcessAll processAll) {