ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(资料中心): 80189

Browse Source
This commit is contained in:
yjz
2024-01-08 18:08:42 +08:00
parent 3087e3b9c6
commit 03ba09f778
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeBacklogTask.java
+33 -3
View File
@@ -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<IPage<ProcessAll>> getTodoList(ProcessAll processAll) {
WorkCenterController workCenterController = applicationContext.getBean(WorkCenterController.class);
return workCenterController.getTodoList(processAll, 1, 10, null);
ProcessAllService processAllService = applicationContext.getBean(ProcessAllService.class);
QueryWrapper<ProcessAll> 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<ProcessAll> page = new Page<>(1, 10);
return Result.OK(processAllService.getTodoList(page, queryWrapper));
}
private QueryWrapper<ProcessAll> getProcessAllQueryWrapper(ProcessAll processAll) {
String prcName = processAll.getPrcName();
String prcNum = processAll.getPrcNum();
Integer prcType = processAll.getPrcType();
Integer prcStatus = processAll.getPrcStatus();
QueryWrapper<ProcessAll> 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;
}
}
laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java
+1 -2
View File
@@ -193,8 +193,7 @@ public class LawsHomeQuickAccessServiceImpl extends ServiceImpl<LawsHomeQuickAcc
List<String> permissionIdList = lawsHomeQuickAccessList.stream().map(LawsHomeQuickAccess::getPermissionId).collect(Collectors.toList());
sysPermissionList = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>()
.in(SysPermission::getId, permissionIdList)
.eq(StringUtils.isNotBlank(menuName), SysPermission::getName, menuName)
.orderByDesc(SysPermission::getCreateTime));
.eq(StringUtils.isNotBlank(menuName), SysPermission::getName, menuName));
}
return sysPermissionList;
}