|
@@ -81,15 +81,15 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
|
|
|
Page<TmColdStorage> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
|
if(param.getType() != null && (param.getType() == 2 || param.getType() == 5)){ //深时归档信息
|
|
|
List<String> numList = page.getRecords().stream().map(TmColdStorage::getSceneNum).collect(Collectors.toList());
|
|
|
- HashMap<String, JSONObject> ssObj = new HashMap<>();
|
|
|
+ HashMap<String, JSONObject> ssSceneMap = new HashMap<>();
|
|
|
if(param.getType() == 2){
|
|
|
- laserService.list(numList,3,4);
|
|
|
+ ssSceneMap =laserService.list(numList,3,4);
|
|
|
}
|
|
|
if(param.getType() == 5){
|
|
|
- laserService.list(numList,3,5);
|
|
|
+ ssSceneMap = laserService.list(numList,3,5);
|
|
|
}
|
|
|
for (TmColdStorage record : page.getRecords()) {
|
|
|
- JSONObject sceneVo = ssObj.get(record.getSceneNum());
|
|
|
+ JSONObject sceneVo = ssSceneMap.get(record.getSceneNum());
|
|
|
if(sceneVo!= null){
|
|
|
record.setSceneName(sceneVo.getString("title"));
|
|
|
record.setSceneWebsite(sceneVo.getString("webSite"));
|