|
@@ -152,8 +152,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
cooNumList = tmContractorNumService.getNumList(sceneNumList);
|
|
cooNumList = tmContractorNumService.getNumList(sceneNumList);
|
|
}
|
|
}
|
|
HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
|
|
HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
|
|
- if(param.getType() == 2 || param.getType() == 5){
|
|
|
|
- ssSceneMap = laserService.list(sceneNumList);
|
|
|
|
|
|
+ if(param.getType() == 2 ){
|
|
|
|
+ ssSceneMap = laserService.list(sceneNumList,4);
|
|
|
|
+ }
|
|
|
|
+ if(param.getType() == 5){
|
|
|
|
+ ssSceneMap = laserService.list(sceneNumList,5);
|
|
}
|
|
}
|
|
HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
|
|
HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
|
|
|
|
|