QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(流程): 会签节点 问题修复

Browse Source
This commit is contained in:
yjz
2024-07-31 15:56:33 +08:00
parent 2f6422771e
commit 8c2ace0e4d
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+14 -7
View File
@@ -44,6 +44,7 @@ import org.activiti.engine.ManagementService;
import org.activiti.engine.RuntimeService; import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService; import org.activiti.engine.TaskService;
import org.activiti.engine.task.Task; import org.activiti.engine.task.Task;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -103,13 +104,19 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
String order = req.getParameter("order"); String order = req.getParameter("order");
IPage<ProcessAll> todoList = processAllMapper.getTodoList(page, queryWrapper, column, order); IPage<ProcessAll> todoList = processAllMapper.getTodoList(page, queryWrapper, column, order);
Set<String> nodeIdSet = todoList.getRecords().stream().map(ProcessAll::getNodeId).collect(Collectors.toSet()); Set<String> nodeIdSet = todoList.getRecords().stream().map(ProcessAll::getNodeId).collect(Collectors.toSet());
List<ProcessNode> processNodeList = processNodeService.list(new LambdaQueryWrapper<ProcessNode>().in(ProcessNode::getId, nodeIdSet)); Set<String> processDefinitionIdSet = todoList.getRecords().stream().map(ProcessAll::getProcessDefinitionId).collect(Collectors.toSet());
todoList.getRecords().forEach(processAll -> { if (CollectionUtils.isNotEmpty(nodeIdSet) && CollectionUtils.isNotEmpty(processDefinitionIdSet)){
processNodeList.stream() List<ProcessNode> processNodeList = processNodeService.list(new LambdaQueryWrapper<ProcessNode>()
.filter(processNode -> processNode.getId().equals(processAll.getNodeId())) .in(ProcessNode::getXmlNodeId, nodeIdSet)
.findFirst() .in(ProcessNode::getProcessDefinitionId, processDefinitionIdSet));
.ifPresent(processNode -> processAll.setCountersignFlag(processNode.getCountersignFlag())); todoList.getRecords().forEach(processAll -> {
}); processNodeList.stream().peek(v -> {
if (v.getXmlNodeId().equals(processAll.getNodeId())){
processAll.setCountersignFlag(v.getCountersignFlag());
}
}).collect(Collectors.toList());
});
}
return todoList; return todoList;
} }