王耀栋--工作台模块代码,测试报告列表修改显示场景id为场景名称

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -1489,7 +1489,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
                         sublistScoreVo.setSceneScore(sc.getScore()); //得分
                         sublistScoreVo.setTargetEvaluate(sc.getTargetEvaluate());//指标评价
-                        sublistScoreVo.setReturnSceneId(sc.getReturnSceneId());//显示的场景id
+//                        sublistScoreVo.setReturnSceneId(sc.getReturnSceneId());//显示的场景id
                         String sceneType = sc.getSceneType();
                         String sceneName = "";
                         if(DictConstants.SCENE_NATURAL.equals(sceneType)){
@@ -1497,24 +1497,33 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                             sublistScoreVo.setSceneType("自然驾驶");
                             //获取场景名称
                             SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneNatural(sc.getSceneId());
-//                            sceneName = sceneBaseInfoVo.getNaturalName();
+                            if(sceneBaseInfoVo != null){
+                                sceneName = sceneBaseInfoVo.getNaturalName();
+                            }
+
                         }else if(DictConstants.SCENE_STANDARD.equals(sceneType)){
                             //标准法规
                             sublistScoreVo.setSceneType("标准法规");
                             //获取场景名称
                             SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneStandardsRegulations(sc.getSceneId());
-//                            sceneName = sceneBaseInfoVo.getSceneName();
+                            if(sceneBaseInfoVo != null){
+                                sceneName = sceneBaseInfoVo.getSceneName();
+                            }
+
                         }else if(DictConstants.SCENE_ACCIDENT.equals(sceneType)){
                             //交通事故
                             sublistScoreVo.setSceneType("交通事故");
                             //获取场景名称
                             SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneAccidentById(sc.getSceneId());
-//                            sceneName = sceneBaseInfoVo.getSceneName();
+                            if(sceneBaseInfoVo != null){
+                                sceneName = sceneBaseInfoVo.getSceneName();
+                            }
+
                         }else if(DictConstants.SCENE_GENERAL.equals(sceneType)){
                             /// TODO 泛化场景暂不支持
 
                         }
-//                        sublistScoreVo.setReturnSceneId(sceneName);//显示场景名称
+                        sublistScoreVo.setReturnSceneId(sceneName);//显示场景名称
 
                         lastSubList.add(sublistScoreVo);
                     }