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

fix 81771 已办流程--搜索流程名称（已撤回的）--报操作失败

Browse Source
This commit is contained in:
lijiarao
2024-02-05 15:51:18 +08:00
parent b5590fe6b3
commit 4ef0493f83
2 changed files with 11 additions and 3 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
+2 -2
View File
@@ -174,8 +174,8 @@ public class WorkCenterController {
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.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);
queryWrapper.groupBy(groupBy, "pa.id");
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+9 -1
View File
@@ -103,6 +103,9 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
String order = req.getParameter("order");
IPage<ProcessAll> completedList = processAllMapper.getCompletedList(page, queryWrapper, column, order);
List<ProcessAll> records = completedList.getRecords();
if (records.isEmpty()){
return completedList;
}
List<String> collect = records.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList());
QueryWrapper<ProcessApprovalRecord> wrapper = new QueryWrapper<>();
wrapper.select("process_instance_id","group_concat(distinct user_id) as user_id");
@@ -123,6 +126,9 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
String order = req.getParameter("order");
IPage<ProcessAll> sentList = processAllMapper.getSentList(page, queryWrapper, column, order);
List<ProcessAll> records = sentList.getRecords();
if (records.isEmpty()){
return sentList;
}
List<String> collect = records.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList());
QueryWrapper<ProcessApprovalRecord> wrapper = new QueryWrapper<>();
wrapper.select("process_instance_id","group_concat(distinct user_id) as user_id");
@@ -142,7 +148,9 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
String order = req.getParameter("order");
IPage<ProcessAll> allList = processAllMapper.getAllList(page, queryWrapper, column, order);
List<ProcessAll> records = allList.getRecords();
if (records.isEmpty()){
return allList;
}
List<String> incompleteCollect = records.stream().filter(item -> ProcessStatusEnum.INCOMPLETE.getValue().equals(item.getPrcStatus())).map(ProcessAll::getProcessInstanceId).collect(Collectors.toList());
List<ProcessApprovalRecord> incompleteRecordList = new ArrayList<>();
if (!incompleteCollect.isEmpty()) {