Merge branch 'wangdingyi' into 'dev'

查询进行中任务

See merge request !197

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -194,6 +194,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                     response.setCarReview(num.setScale(1, BigDecimal.ROUND_UP).doubleValue());
                 }
             }
+            String[] taskList = response.getTaskList().split(",");
+            if (response.getPointer() < taskList.length) {
+                response.setNextSubTask(taskList[response.getPointer()]);
+            } else {
+                response.setNextSubTask(taskList[taskList.length - 1]);
+            }
         }
         return responses;
     }

quality-review/src/main/java/com/ruoyi/web/response/TaskFindResponse.java

@@ -30,6 +30,9 @@ public class TaskFindResponse {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long modelTestTaskId;
 
+    @ApiModelProperty("下一个子任务")
+    private String nextSubTask;
+
 
     @ApiModelProperty("标准名称（检验依据）")
     private String name;
@@ -109,4 +112,10 @@ public class TaskFindResponse {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date testEndTime;
 
+    @ApiModelProperty("任务列表")
+    private String taskList;
+
+    @ApiModelProperty("指向待执行节点的指针[0、1、2]")
+    private int pointer;
+
 }

quality-review/src/main/resources/mapper/TaskMapper.xml

@@ -64,6 +64,8 @@
         <result property="testBeginTime" column="test_begin_time" jdbcType="TIMESTAMP"/>
         <result property="testEndTime" column="test_end_time" jdbcType="TIMESTAMP"/>
         <result property="standardNo" column="standard_no" jdbcType="BIGINT"/>
+        <result property="taskList" column="task_list" jdbcType="BIGINT"/>
+        <result property="pointer" column="pointer" jdbcType="BIGINT"/>
     </resultMap>
 
     <select id="findList" parameterType="com.ruoyi.web.request.TaskListRequest" resultMap="BaseResultMap">
@@ -94,6 +96,8 @@
                t.task_begin_time,
                t.product_model,
                t.standard_no,
+               t.task_list,
+               t.pointer,
                srt.task_begin_time system_task_begin_time,
                srt.task_end_time system_task_end_time,
                srt.task_status review_status,