1、优化任务设置拓展字段代码
This commit is contained in:
@@ -732,6 +732,14 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
}
|
||||
}
|
||||
}
|
||||
// 查询当前任务的所有拓展属性
|
||||
Map<String, List<TaskNodeExtraPo>> taskExtraMap = Optional.ofNullable(
|
||||
taskMapper.getTaskExtraList(
|
||||
currentNodeAssociatedTaskList.stream()
|
||||
.map(TaskNodePo::getUuid)
|
||||
.toList()
|
||||
)
|
||||
).orElse(Collections.emptyList()).stream().collect(Collectors.groupingBy(TaskNodeExtraPo::getTaskId));
|
||||
for (TaskNodePo taskNodePo : currentNodeAssociatedTaskList) {
|
||||
List<Long> fileIdList = new ArrayList<>();
|
||||
List<String> fileNameList = new ArrayList<>();
|
||||
@@ -776,6 +784,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
taskNodePo.setFlowTemplateNames(String.join(",", flowTemplateNameList));
|
||||
}
|
||||
}
|
||||
// 返回任务的拓展属性
|
||||
taskNodePo.setExtras(taskExtraMap.get(taskNodePo.getUuid()));
|
||||
}
|
||||
|
||||
// 查询当前任务下指标
|
||||
@@ -943,26 +953,15 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
}
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(currentNodeAssociatedTaskList)) {
|
||||
List<String> taskIdList = currentNodeAssociatedTaskList.stream().map(TaskNodePo::getUuid).toList();
|
||||
List<TaskNodeExtraPo> taskExtraList = taskMapper.getTaskExtraList(taskIdList);
|
||||
Map<String, List<TaskNodeExtraPo>> taskExtraMap = new HashMap<>();
|
||||
if (CollectionUtils.isNotEmpty(taskExtraList)) {
|
||||
taskExtraMap = taskExtraList.stream().collect(Collectors.groupingBy(TaskNodeExtraPo::getTaskId));
|
||||
}
|
||||
Map<String, List<TaskNodeExtraPo>> finalTaskExtraMap = taskExtraMap;
|
||||
currentNodeAssociatedTaskList.forEach(task -> {
|
||||
task.setNodeName(task.getTaskName());
|
||||
task.setNodeCode(task.getTaskCode());
|
||||
task.setSection(task.getSectionName());
|
||||
task.setGroup(task.getGroupName());
|
||||
// 设置拓展属性
|
||||
task.setExtras(finalTaskExtraMap.get(task.getUuid()));
|
||||
});
|
||||
for (TaskNodePo nodePo : currentNodeAssociatedTaskList) {
|
||||
if (StringUtils.isBlank(nodePo.getEnglishName())) {
|
||||
nodePo.setEnglishName("");
|
||||
if (StringUtils.isBlank(task.getEnglishName())) {
|
||||
task.setEnglishName("");
|
||||
}
|
||||
}
|
||||
});
|
||||
children.addAll(currentNodeAssociatedTaskList);
|
||||
}
|
||||
projectNodePo.setChildren(children);
|
||||
|
||||
Reference in New Issue
Block a user