修改评估报告查看

This commit is contained in:
sunxiqing 2025-01-03 15:17:57 +08:00
parent c15363be6a
commit 1a6c0a16e5

View File

@ -174,33 +174,39 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic
List<Long> serviceIds = modelAssessTaskAutoDOPageResult.getList().stream().
filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 0)
.map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList());
Map<Long, ModelServiceDO> longModelServiceDOMap = null;
if (!CollectionUtils.isEmpty(serviceIds)){
LambdaQueryWrapper<ModelServiceDO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ModelServiceDO::getId,serviceIds);
List<ModelServiceDO> modelServiceDOS = modelServiceMapper.selectList(wrapper);
Map<Long, ModelServiceDO> longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection.
longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
}
// 人工模型获取校验
List<Long> serviceForeseeIds = modelAssessTaskAutoDOPageResult.getList().stream().
filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 1)
.map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList());
List<BaseModelDO> baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper<BaseModelDO>()
.in(BaseModelDO::getId, serviceForeseeIds));
Map<Long, BaseModelDO> serviceForeseeMaps = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(baseModelDOS, BaseModelDO::getId);
result.getList().stream().forEach(modelAssessTaskManualRespVO -> {
if (modelAssessTaskManualRespVO.getModelType() == 0){
Map<Long, BaseModelDO> serviceForeseeMaps = null;
if (!CollectionUtils.isEmpty(serviceForeseeIds)) {
List<BaseModelDO> baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper<BaseModelDO>()
.in(BaseModelDO::getId, serviceForeseeIds));
serviceForeseeMaps = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(baseModelDOS, BaseModelDO::getId);
}
for (ModelAssessTaskAutoRespVO modelAssessTaskManualRespVO : result.getList()){
if (modelAssessTaskManualRespVO.getModelType() == 0 && longModelServiceDOMap != null){
ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskManualRespVO.getModelService());
if(modelServiceDO != null){
modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName());
}
}else {
}else if (modelAssessTaskManualRespVO.getModelType() == 1 && serviceForeseeMaps != null){
BaseModelDO baseModelDO = serviceForeseeMaps.get(modelAssessTaskManualRespVO.getModelService());
if(baseModelDO != null){
modelAssessTaskManualRespVO.setModelServiceName(baseModelDO.getModelName());
}
}
});
}
}
return result;
}