From 03ba09f7781bf6d216104ece82c55a01717f0b20 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 8 Jan 2024 18:08:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83):=2080?= =?UTF-8?q?189?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/controller/LawsHomeBacklogTask.java | 36 +++++++++++++++++-- .../impl/LawsHomeQuickAccessServiceImpl.java | 3 +- 2 files changed, 34 insertions(+), 5 deletions(-) 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 c4dd5df3..950a044d 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 @@ -8,14 +8,21 @@ package com.jero.modules.laws.home.controller; * @Version: 1.0 **/ +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.modules.activiti.controller.WorkCenterController; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.enums.FinishFlagEnum; +import com.jero.modules.activiti.enums.ProcessStatusEnum; +import com.jero.modules.activiti.service.ProcessAllService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.context.ApplicationContext; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -47,7 +54,30 @@ public class LawsHomeBacklogTask { @ApiOperation(value="待办任务-列表查询", notes="快捷入口-列表查询") @GetMapping(value = "/queryBacklogTaskList") public Result> getTodoList(ProcessAll processAll) { - WorkCenterController workCenterController = applicationContext.getBean(WorkCenterController.class); - return workCenterController.getTodoList(processAll, 1, 10, null); + ProcessAllService processAllService = applicationContext.getBean(ProcessAllService.class); + QueryWrapper queryWrapper = getProcessAllQueryWrapper(processAll); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = loginUser.getId(); + queryWrapper.eq("par.user_id",userId); + queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue()); + 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)); + } + + private QueryWrapper getProcessAllQueryWrapper(ProcessAll processAll) { + String prcName = processAll.getPrcName(); + String prcNum = processAll.getPrcNum(); + Integer prcType = processAll.getPrcType(); + Integer prcStatus = processAll.getPrcStatus(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(prcName), "pa.prc_name", "%" + prcName + "%"); + 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); + + + return queryWrapper; } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java index 06592fe2..917d28d4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java @@ -193,8 +193,7 @@ public class LawsHomeQuickAccessServiceImpl extends ServiceImpl permissionIdList = lawsHomeQuickAccessList.stream().map(LawsHomeQuickAccess::getPermissionId).collect(Collectors.toList()); sysPermissionList = sysPermissionService.list(new LambdaQueryWrapper() .in(SysPermission::getId, permissionIdList) - .eq(StringUtils.isNotBlank(menuName), SysPermission::getName, menuName) - .orderByDesc(SysPermission::getCreateTime)); + .eq(StringUtils.isNotBlank(menuName), SysPermission::getName, menuName)); } return sysPermissionList; }