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

fix 79296 流程中心-排序都是按照时间正序排列的，建议倒序排列

Browse Source
This commit is contained in:
lijiarao
2024-01-12 11:16:08 +08:00
parent 76d2815f0e
commit fa8b450e2c
5 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
+11 -11
View File
@@ -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<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll);
QueryWrapper<ProcessAll> 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<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> todoList = processAllService.getTodoList(page, queryWrapper);
IPage<ProcessAll> 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<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll);
QueryWrapper<ProcessAll> 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<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> completedList = processAllService.getCompletedList(page, queryWrapper);
IPage<ProcessAll> 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<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll);
QueryWrapper<ProcessAll> 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<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> sentList = processAllService.getSentList(page, queryWrapper);
IPage<ProcessAll> 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<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll);
QueryWrapper<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll, true);
Page<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> sentList = processAllService.getAllList(page, queryWrapper);
IPage<ProcessAll> sentList = processAllService.getAllList(page, queryWrapper, req);
return Result.OK(sentList);
}
@@ -148,7 +149,7 @@ public class WorkCenterController {
}
@NotNull
private QueryWrapper<ProcessAll> getProcessAllQueryWrapper(ProcessAll processAll) {
private QueryWrapper<ProcessAll> 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;
}