toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、查询任务列表 bugfix

Browse Source
This commit is contained in:
lidongyang
2025-12-29 16:45:53 +08:00
parent 119286b17c
commit 3e47542145
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -306,6 +306,25 @@ public class TaskServiceImpl implements ITaskService {
}
}
}
if (ObjectUtils.isNotEmpty(req.getPMemberList())) {
List<Long> pMemberIdList = Stream.of(req.getPMemberList().split(",")).map(Long::valueOf).toList();
// 通过仿真负责人过滤
taskMemberVoList = taskMemberVoList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType()) && pMemberIdList.contains(member.getUserId())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(taskMemberVoList)) {
log.error("taskMemberVoList为空");
jsonObject.put("total", 0);
return SdmResponse.success(jsonObject);
}
memberMap = taskMemberVoList.stream().collect(Collectors.groupingBy(SpdmTaskMemberVo::getTaskId));
List<String> realTaskIdList = taskMemberVoList.stream().map(SpdmTaskMemberVo::getTaskId).distinct().toList();
// 根据负责人信息过滤任务
taskList = taskList.stream().filter(eachTask -> realTaskIdList.contains(eachTask.getUuid())).toList();
if (CollectionUtils.isEmpty(taskList)) {
log.error("taskList为空");
jsonObject.put("total", 0);
return SdmResponse.success(jsonObject);
}
}
eachAttentionMemberList = attentionMap.get(task.getUuid());
task.setAttentionFlag(CollectionUtils.isEmpty(eachAttentionMemberList) ? 0 :
(eachAttentionMemberList.stream().map(SpdmTaskAttentionMemberVo::getUserId).toList().contains(userId) ? 1 : 0));