|
@@ -75,25 +75,22 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
|
|
|
if(numList ==null || numList.size() <=0){
|
|
|
continue;
|
|
|
}
|
|
|
- if(type == 0 || type == 1 || type == 2){
|
|
|
- ScenePram scenePram = new ScenePram();
|
|
|
- scenePram.setType(type);
|
|
|
- scenePram.setPageNum(1);
|
|
|
- scenePram.setPageSize(99999);
|
|
|
- scenePram.setNumList(param.getTypeMap().get(type));
|
|
|
- PageInfo pageInfo = sceneService.pageList(scenePram,token);
|
|
|
- List<SceneVo> list1 = (List<SceneVo>) pageInfo.getList();
|
|
|
- listAll.addAll(list1);
|
|
|
- }else if(type == 3){
|
|
|
- List<SceneVo> voList = new ArrayList<>();
|
|
|
- List<Model> modelList = modelService.getListByModeId(numList);
|
|
|
- for (Model model : modelList) {
|
|
|
- SceneVo sceneVo = new SceneVo();
|
|
|
- BeanUtils.copyProperties(model,sceneVo);
|
|
|
- voList.add(sceneVo);
|
|
|
- }
|
|
|
- listAll.addAll(voList);
|
|
|
+ ScenePram scenePram = new ScenePram();
|
|
|
+ scenePram.setType(type);
|
|
|
+ scenePram.setPageNum(1);
|
|
|
+ scenePram.setPageSize(99999);
|
|
|
+ scenePram.setNumList(param.getTypeMap().get(type));
|
|
|
+ PageInfo pageInfo = sceneService.pageList(scenePram,token);
|
|
|
+ List<SceneVo> list1 = (List<SceneVo>) pageInfo.getList();
|
|
|
+ listAll.addAll(list1);
|
|
|
+ List<SceneVo> voList = new ArrayList<>();
|
|
|
+ List<Model> modelList = modelService.getListByModeId(numList);
|
|
|
+ for (Model model : modelList) {
|
|
|
+ SceneVo sceneVo = new SceneVo();
|
|
|
+ BeanUtils.copyProperties(model,sceneVo);
|
|
|
+ voList.add(sceneVo);
|
|
|
}
|
|
|
+ listAll.addAll(voList);
|
|
|
}
|
|
|
return listAll;
|
|
|
}
|