1、查询需求时,设置风险状态
This commit is contained in:
@@ -392,6 +392,23 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
|
||||
log.error("demandList4为空");
|
||||
return SdmResponse.success(jsonObject);
|
||||
}
|
||||
List<SpdmTaskVo> eachTaskList;
|
||||
String eachStatus;
|
||||
for (SpdmDemandVo demand : demandList) {
|
||||
eachTaskList = taskMap.get(demand.getUuid());
|
||||
if (CollectionUtils.isEmpty(eachTaskList)) {
|
||||
demand.setAchieveStatus("0");
|
||||
continue;
|
||||
}
|
||||
if (eachTaskList.stream().map(SpdmTaskVo::getAchieveStatus).toList().contains(TaskAchieveStatusEnum.UNQUALIFIED.getCode())) {
|
||||
eachStatus = TaskAchieveStatusEnum.UNQUALIFIED.getCode();
|
||||
} else if (eachTaskList.stream().map(SpdmTaskVo::getAchieveStatus).toList().contains(TaskAchieveStatusEnum.NO_CALCULATE.getCode())) {
|
||||
eachStatus = TaskAchieveStatusEnum.NO_CALCULATE.getCode();
|
||||
} else {
|
||||
eachStatus = TaskAchieveStatusEnum.QUALIFIED.getCode();
|
||||
}
|
||||
demand.setAchieveStatus(eachStatus);
|
||||
}
|
||||
Map<String, List<SpdmDemandMemberVo>> demandMemberMap = Map.of();
|
||||
if (CollectionUtils.isNotEmpty(demandMemberVoList)) {
|
||||
demandMemberMap = demandMemberVoList.stream().collect(Collectors.groupingBy(SpdmDemandMemberVo::getDemandId));
|
||||
@@ -423,7 +440,6 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
|
||||
}
|
||||
}
|
||||
|
||||
List<SpdmTaskVo> eachTaskList;
|
||||
for (SpdmDemandVo spdmDemandVo : demandList) {
|
||||
eachTaskList = taskMap.get(spdmDemandVo.getUuid());
|
||||
spdmDemandVo.setProgress(CollectionUtils.isEmpty(eachTaskList) ? 0 : eachTaskList.stream().mapToInt(SpdmTaskVo::getProgress).sum() / eachTaskList.size());
|
||||
|
||||
Reference in New Issue
Block a user