修改分页查询 查询不到报错 人工 和自动评估

This commit is contained in:
limin 2024-12-30 10:27:15 +08:00
parent 1516e52ef5
commit 645cc8325b
2 changed files with 28 additions and 24 deletions

View File

@ -160,18 +160,20 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic
PageResult<ModelAssessTaskAutoDO> modelAssessTaskAutoDOPageResult = modelAssessTaskAutoMapper.selectPage(pageReqVO);
PageResult<ModelAssessTaskAutoRespVO> result = BeanUtils.toBean(modelAssessTaskAutoDOPageResult, ModelAssessTaskAutoRespVO.class);
List<Long> serviceIds = modelAssessTaskAutoDOPageResult.getList().stream().map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList());
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.
CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
result.getList().stream().forEach(modelAssessTaskAutoRespVO -> {
ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskAutoRespVO.getModelService());
if(modelServiceDO != null){
modelAssessTaskAutoRespVO.setModelServiceName(modelServiceDO.getServiceName());
}
});
if (CollectionUtils.isNotEmpty(result.getList())){
List<Long> serviceIds = modelAssessTaskAutoDOPageResult.getList().stream().map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList());
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.
CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
result.getList().stream().forEach(modelAssessTaskAutoRespVO -> {
ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskAutoRespVO.getModelService());
if(modelServiceDO != null){
modelAssessTaskAutoRespVO.setModelServiceName(modelServiceDO.getServiceName());
}
});
}
return result;
}

View File

@ -151,18 +151,20 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe
public PageResult<ModelAssessTaskManualRespVO> getModelAssessTaskManualPage1(ModelAssessTaskManualPageReqVO pageReqVO) {
PageResult<ModelAssessTaskManualDO> modelAssessTaskManualDOPageResult = modelAssessTaskManualMapper.selectPage(pageReqVO);
PageResult<ModelAssessTaskManualRespVO> result = BeanUtils.toBean(modelAssessTaskManualDOPageResult, ModelAssessTaskManualRespVO.class);
List<Long> serviceIds = modelAssessTaskManualDOPageResult.getList().stream().map(ModelAssessTaskManualDO::getModelService).collect(Collectors.toList());
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.
CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
result.getList().stream().forEach(modelAssessTaskManualRespVO -> {
ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskManualRespVO.getModelService());
if(modelServiceDO != null){
modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName());
}
});
if (CollectionUtils.isNotEmpty(result.getList())){
List<Long> serviceIds = modelAssessTaskManualDOPageResult.getList().stream().map(ModelAssessTaskManualDO::getModelService).collect(Collectors.toList());
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.
CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
result.getList().stream().forEach(modelAssessTaskManualRespVO -> {
ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskManualRespVO.getModelService());
if(modelServiceDO != null){
modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName());
}
});
}
return result;
}
@Override