王耀栋--评测等级bug修改

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

@@ -25,6 +25,8 @@ public class SimulationManualProjectVo {
 
     private Date lastRunTime;
 
+    private String lastRunTimeFmt;
+
     private String automaticRunState;
 
     private String nowRunState;//进度(字典)

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

@@ -399,7 +399,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         projectDetailsVo.setPackageName(scenePackagePO.getPackageName());
 
         //评测等级
-        String s = getEvaluationLevel(poParam);
+//        String s = getEvaluationLevel(poParam);
 
         //算法配置
         AlgorithmPO algorithmBaseInfoVo = getAlgorithmInfo(poParam);
@@ -504,8 +504,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         projectDetailsVo.setFinishTime(getRqStr(poParam.getFinishTime(),1));
         projectDetailsVo.setNowRunState(poParam.getNowRunState());
         projectDetailsVo.setNowRunStateName(getDictName(DictConstants.PROJECT_RUN_STATE, poParam.getNowRunState()));
-//        projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
-        projectDetailsVo.setEvaluationLevel(s);
+        projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, poParam.getEvaluationLevel()));
+//        projectDetailsVo.setEvaluationLevel(s);
         if(algorithmBaseInfoVo != null){
             projectDetailsVo.setAlgorithmName(algorithmBaseInfoVo.getAlgorithmName());
             projectDetailsVo.setAlgorithmDescribe(algorithmBaseInfoVo.getDescription());
@@ -1500,6 +1500,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if(!isAuto){
             vo.setNowRunStateDict(getDictName(DictConstants.PROJECT_RUN_STATE, vo.getNowRunState()));
             vo.setEvaluationLevelDict(getDictName(DictConstants.EVALUATION_LEVEL,vo.getEvaluationLevel()));
+        }else{
+            vo.setLastRunTimeFmt(getRqStr(vo.getLastRunTime(),1));
         }
 
         return vo;
@@ -3284,6 +3286,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         }
 
+        //TODO 该段代码可优化，有时间再优化
         List<ScenePackageSubListVO> scenePackageSubListVOS = simulationProjectMapper.selectSubSceneByPid(scene);
 
         String evaluationLevelReport = "";