|
|
|
@ -246,7 +246,8 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
|
|
|
|
|
public List<KnowledgeFlowRecordResVO> queryKnowledgeFlowRecord(String knowledgeId, String flowId) {
|
|
|
|
|
List<KnowledgeFlowRecord> list = knowledgeFlowRecordService.lambdaQuery().eq(KnowledgeFlowRecord::getKnowledgeId, knowledgeId)
|
|
|
|
|
.eq(StrUtil.isNotBlank(flowId), KnowledgeFlowRecord::getFlowId, flowId).list();
|
|
|
|
|
List<KnowledgeFlowRecordResVO> result = list.stream().sorted(Comparator.comparingInt(KnowledgeFlowRecord::getFlowRuleOrder)).map(knowledgeFlowRecord -> {
|
|
|
|
|
// 根据时间进行排序
|
|
|
|
|
List<KnowledgeFlowRecordResVO> result = list.stream().map(knowledgeFlowRecord -> {
|
|
|
|
|
KnowledgeFlowRecordResVO node = new KnowledgeFlowRecordResVO();
|
|
|
|
|
node.setKnowledgeId(knowledgeFlowRecord.getKnowledgeId());
|
|
|
|
|
node.setProcessName(knowledgeFlowRecord.getProcessName());
|
|
|
|
@ -264,7 +265,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return node;
|
|
|
|
|
}).toList();
|
|
|
|
|
}).sorted(Comparator.comparing(KnowledgeFlowRecordResVO::getProcessTime)).toList();
|
|
|
|
|
// 然后把人名和部门名进行转换
|
|
|
|
|
Set<String> userIdSet = result.stream().map(KnowledgeFlowRecordResVO::getProcessUserId).collect(Collectors.toSet());
|
|
|
|
|
List<SystemUser> systemUsers = systemUserService.listByIds(userIdSet);
|
|
|
|
|