自动子项目开始时间

simulation-resource-server/src/main/java/com/css/simulation/resource/project/ctrl/SimulationProjectCtrl.java

@@ -320,7 +320,7 @@ public class SimulationProjectCtrl {
      */
     @RequestMapping("selectSubProjectList")
     @ResponseBody
-    public ResponseBodyVO selectSubProjectList(@RequestBody SimulationManualProjectParam param) {
+    public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectSubProjectList(@RequestBody SimulationManualProjectParam param) {
         return service.selectSubProjectList(param);
     }
 

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

@@ -3982,29 +3982,22 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     @Override
-    public ResponseBodyVO selectSubProjectList(SimulationManualProjectParam param) {
+    public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectSubProjectList(SimulationManualProjectParam param) {
 
         String id = param.getParentId();
 
         if (isEmpty(id)) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "id不能为空");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "id不能为空");
         }
 
         setPage(param.getCurrentPage() == null ? 1 : param.getCurrentPage(), param.getPageSize() == null ? 10 : param.getPageSize());
 
-        List<SimulationManualProjectVo> vos = simulationAutomaticSubProjectMapper.selectList(param);
-        PageInfo<SimulationManualProjectVo> pageInfo = new PageInfo(vos);
-
-        for (SimulationManualProjectVo p : pageInfo.getList()) {
-
-            p.setStartTimeFmt(getRqStr(p.getStartTime(), 1));
-            p.setFinishTimeFmt(getRqStr(p.getFinishTime(), 1));
-            p.setNowRunStateDict(getDictName(DictConstants.PROJECT_RUN_STATE, p.getNowRunState()));
-            p.setEvaluationLevelDict(getDictName(DictConstants.EVALUATION_LEVEL, p.getEvaluationLevel()));
-
-        }
-
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, pageInfo);
+        List<SimulationManualProjectVo> simulationManualProjectVoList = simulationAutomaticSubProjectMapper.selectList(param);
+        simulationManualProjectVoList.forEach(simulationManualProjectVo -> {
+            simulationManualProjectVo.setNowRunStateDict(getDictName(DictConstants.PROJECT_RUN_STATE, simulationManualProjectVo.getNowRunState()));
+            simulationManualProjectVo.setEvaluationLevelDict(getDictName(DictConstants.EVALUATION_LEVEL, simulationManualProjectVo.getEvaluationLevel()));
+        });
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, new PageInfo<>(simulationManualProjectVoList));
     }
 
     @Override

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/SimulationProjectService.java

@@ -70,7 +70,7 @@ public interface SimulationProjectService {
 
     ResponseBodyVO selectSubProjectInfo(SimulationManualProjectParam param);
 
-    ResponseBodyVO selectSubProjectList(SimulationManualProjectParam param);
+    ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectSubProjectList(SimulationManualProjectParam param);
 
     ResponseBodyVO selectAutomaticProjectById(SimulationManualProjectParam param);
 

simulation-resource-server/src/main/resources/mapper/project/SimulationAutomaticSubProjectMapper.xml

@@ -78,7 +78,31 @@
 
     <!--查询列表-->
     <select id="selectList" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.vo.project.SimulationManualProjectVo" >
-        select * from simulation_automatic_subproject  where parent_id=#{parentId,jdbcType=VARCHAR} and is_deleted='0' order by project_num desc
+        select id,
+               parent_id,
+               parent_project_id,
+               project_date,
+               project_num,
+               project_id,
+               project_name,
+               now_run_state,
+               evaluation_level,
+               start_time,
+               start_time start_time_fmt,
+               finish_time,
+               finish_time finish_time_fmt,
+               algorithm_score,
+               task_number,
+               task_completed,
+               create_time,
+               create_user_id,
+               modify_time,
+               modify_user_id,
+               is_deleted
+        from simulation_automatic_subproject
+        where is_deleted = '0'
+          and parent_id = #{parentId}
+        order by project_num desc
     </select>
 
     <!--根据id查询-->