王耀栋--工作台模块代码提交

api-common/src/main/java/api/common/pojo/param/project/SimulationManualProjectParam.java

@@ -96,5 +96,8 @@ public class SimulationManualProjectParam extends PageVO {
     //任务id
     private String taskId;
 
+    //算法类型
+    private String algorithmType;
+
 
 }

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

@@ -30,6 +30,9 @@ public class ProjectDetailsVo {
     //当前运行状态（进度）
     private String nowRunState;
 
+    //当前运行状态（进度）
+    private String nowRunStateName;
+
     //评测等级
     private String evaluationLevel;
 

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

@@ -360,7 +360,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         projectDetailsVo.setProjectDescribe(po.getProjectDescribe());
         projectDetailsVo.setStartTime(getRqStr(po.getStartTime(),1));
         projectDetailsVo.setFinishTime(getRqStr(po.getFinishTime(),1));
-        projectDetailsVo.setNowRunState(getDictName(DictConstants.PROJECT_RUN_STATE, po.getNowRunState()));
+        projectDetailsVo.setNowRunState(po.getNowRunState());
+        projectDetailsVo.setNowRunStateName(getDictName(DictConstants.PROJECT_RUN_STATE, po.getNowRunState()));
 //        projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
         projectDetailsVo.setEvaluationLevel(s);
         if(algorithmBaseInfoVo != null){