commit

api-common/src/main/java/api/common/pojo/vo/project/SimulationManualProjectEvaluationRuleVo.java

@@ -34,5 +34,8 @@ public class SimulationManualProjectEvaluationRuleVo {
     private String coverageRateEvaluationRuleId;
     private String coverageRateEvaluationRuleName;
     private String finishTime;
+    private String evaluationJsonMsg;
+    // 场景评价状态
+    private SimulationManualProjectEvaluationVO simulationManualProjectEvaluation;
 
 }

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

@@ -5543,6 +5543,15 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
         ScenePackageNewVO scenePackagePO = scenePackageMapper.queryScenePackageBySublist(po.getScene());
         po.setSceneNum(scenePackagePO.getSceneNum());
+        if (StringUtil.isNotEmpty(po.getEvaluationJsonMsg())) {
+            try {
+                SimulationManualProjectEvaluationVO simulationManualProjectEvaluationVO =
+                        JsonUtil.jsonToBean(po.getEvaluationJsonMsg(), SimulationManualProjectEvaluationVO.class);
+                po.setSimulationManualProjectEvaluation(simulationManualProjectEvaluationVO);
+            } catch (Exception e) {
+                log.error("获取场景评价状态异常 {}", po.getEvaluationJsonMsg(), e);
+            }
+        }
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, po);
     }
 

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

@@ -78,7 +78,7 @@
 
     <!--根据id查询工作信息-->
     <select id="selectEvaluationDetailByProjectId" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.vo.project.SimulationManualProjectEvaluationRuleVo">
-        select id,project_name,project_describe,scene,coverage_rate_evaluation_rule_id,exposure_rate_evaluation_rule_id,complexity_evaluation_rule_id,risk_evaluation_rule_id,finish_time
+        select id,project_name,project_describe,scene,coverage_rate_evaluation_rule_id,exposure_rate_evaluation_rule_id,complexity_evaluation_rule_id,risk_evaluation_rule_id,finish_time,evaluation_json_msg
         from simulation_manual_project
         where id = #{id,jdbcType=VARCHAR}
     </select>