李春阳 1 tahun lalu
induk
melakukan
060d9ff79b

+ 5 - 2
simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/SimulationProjectServiceImpl.java

@@ -2198,6 +2198,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                             sublistScoreVo.setSceneType("泛化");
                             sublistScoreVo.setSceneType("泛化");
                             SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneGeneralDataById(sceneId);
                             SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneGeneralDataById(sceneId);
                             sceneName = sceneBaseInfoVo.getSceneName();
                             sceneName = sceneBaseInfoVo.getSceneName();
+                        } else if (DictConstants.SCENE_REFERENCE_LIB.equals(sceneType)) {
+                            sublistScoreVo.setSceneType("基准场景库");
+                            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneReferenceLibDataById(sceneId);
+                            sceneName = sceneBaseInfoVo.getSceneName();
                         }
                         }
                         sublistScoreVo.setReturnSceneId(sceneName); // 显示场景名称
                         sublistScoreVo.setReturnSceneId(sceneName); // 显示场景名称
                         lastSubList.add(sublistScoreVo);
                         lastSubList.add(sublistScoreVo);
@@ -3051,10 +3055,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             List<AlgorithmScoreVO> algorithmScoreList = vo.getAlgorithmScoreList();
             List<AlgorithmScoreVO> algorithmScoreList = vo.getAlgorithmScoreList();
 
 
             StringBuilder stringBuilder = new StringBuilder("       " + vo.getAlgorithmName() + "在");
             StringBuilder stringBuilder = new StringBuilder("       " + vo.getAlgorithmName() + "在");
-            Integer totalSceneNum = null;
+            int totalSceneNum = vo.getSceneScoreLi().size();
             for (AlgorithmScoreVO v : algorithmScoreList) {
             for (AlgorithmScoreVO v : algorithmScoreList) {
                 if ("汇总".equals(v.getProjectName())) {
                 if ("汇总".equals(v.getProjectName())) {
-                    totalSceneNum = v.getSceneNum();
                     continue;
                     continue;
                 }
                 }
                 stringBuilder.append(v.getProjectName()).append("项目的").append(v.getSceneNum()).append("个场景中,测试得分为").append(v.getScore()).append(",得分率为").append(v.getScoreRatio()).append("%;");
                 stringBuilder.append(v.getProjectName()).append("项目的").append(v.getSceneNum()).append("个场景中,测试得分为").append(v.getScore()).append(",得分率为").append(v.getScoreRatio()).append("%;");

+ 2 - 0
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SimulationManualProjectMapper.java

@@ -88,6 +88,8 @@ public interface SimulationManualProjectMapper {
 
 
     SceneBaseInfoVo selectSceneGeneralDataById(String id);
     SceneBaseInfoVo selectSceneGeneralDataById(String id);
 
 
+    SceneBaseInfoVo selectSceneReferenceLibDataById(String id);
+
     SceneBaseInfoVo selectSceneStandardsRegulations(String id);
     SceneBaseInfoVo selectSceneStandardsRegulations(String id);
 
 
     List<ScenePackageSubListVO> selectSubSceneByPid(String id);
     List<ScenePackageSubListVO> selectSubSceneByPid(String id);

+ 9 - 0
simulation-resource-server/src/main/resources/mysql/mapper/SimulationManualProjectMapper.xml

@@ -500,6 +500,15 @@
         from scene_general_data
         from scene_general_data
         where id = #{id}
         where id = #{id}
     </select>
     </select>
+
+    <!--查询基准场景库-->
+    <select id="selectSceneReferenceLibDataById" parameterType="string"
+            resultType="api.common.pojo.vo.project.SceneBaseInfoVo">
+        select scene_name
+        from scene_reference_lib
+        where scene_id = #{id}
+    </select>
+
     <!--查询标准法规场景信息-->
     <!--查询标准法规场景信息-->
     <select id="selectSceneStandardsRegulations" parameterType="string"
     <select id="selectSceneStandardsRegulations" parameterType="string"
             resultType="api.common.pojo.vo.project.SceneBaseInfoVo">
             resultType="api.common.pojo.vo.project.SceneBaseInfoVo">