查询处理中总任务&处理完成总任务

quality-review/src/main/java/com/ruoyi/web/request/TaskFindFinishRequest.java

@@ -11,11 +11,8 @@ import java.util.Date;
 @Data
 public class TaskFindFinishRequest extends PageDomain {
 
-    @ApiModelProperty("任务编号")
-    private String taskNo;
-
-    @ApiModelProperty("名称关键词")
-    private String taskName;
+    @ApiModelProperty("任务编号或名称关键词")
+    private String taskNoOrName;
 
     @ApiModelProperty("任务开始时间")
     private Date taskBeginTime;

quality-review/src/main/java/com/ruoyi/web/request/TaskFindPendingRequest.java

@@ -11,11 +11,8 @@ import java.util.Date;
 @Data
 public class TaskFindPendingRequest extends PageDomain {
 
-    @ApiModelProperty("任务编号")
-    private String taskNo;
-
-    @ApiModelProperty("名称关键词")
-    private String taskName;
+    @ApiModelProperty("任务编号或名称关键词")
+    private String taskNoOrName;
 
     @ApiModelProperty("任务开始时间")
     private Date taskBeginTime;

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @ApiModel(value = "TaskFindPendingResponse", description = "进行中的总任务")
 @Data
 public class TaskFindPendingResponse {
@@ -30,6 +32,9 @@ public class TaskFindPendingResponse {
     @ApiModelProperty("任务状态（NEW、PENDING、FINISH）")
     private String taskStatus;
 
+    @ApiModelProperty("总任务开始时间")
+    private Date taskBeginTime;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @ApiModelProperty("审核组长id")
     private Long leaderId;
@@ -40,18 +45,30 @@ public class TaskFindPendingResponse {
     @ApiModelProperty("体系审查任务状态")
     private String reviewStatus;
 
-    @ApiModelProperty("车型审查任务状态")
-    private String carReviewStatus;
-
-    @ApiModelProperty("测试任务状态")
-    private String carTestStatus;
-
     @ApiModelProperty("体系审查任务进度")
     private Long systemReview;
 
+    @ApiModelProperty("体系问卷任务开始时间")
+    private Date systemTaskBeginTime;
+
+    @ApiModelProperty("体系问卷任务开始时间")
+    private Date systemTaskEndTime;
+
+    @ApiModelProperty("车型审查任务状态")
+    private String carReviewStatus;
+
     @ApiModelProperty("车型审查任务进度")
     private Long carReview;
 
+    @ApiModelProperty("车辆问卷任务开始时间")
+    private Date carTaskBeginTime;
+
+    @ApiModelProperty("车辆问卷任务开始时间")
+    private Date carTaskEndTime;
+
+    @ApiModelProperty("测试任务状态")
+    private String carTestStatus;
+
     @ApiModelProperty("测试任务进度")
     private Long carTest;
 }

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

@@ -48,6 +48,11 @@
         <result property="taskNo" column="task_no" jdbcType="VARCHAR"/>
         <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
         <result property="taskStatus" column="task_status" jdbcType="VARCHAR"/>
+        <result property="taskBeginTime" column="task_begin_time" jdbcType="TIMESTAMP"/>
+        <result property="systemTaskBeginTime" column="system_task_begin_time" jdbcType="TIMESTAMP"/>
+        <result property="systemTaskEndTime" column="system_task_end_time" jdbcType="TIMESTAMP"/>
+        <result property="carTaskBeginTime" column="car_task_begin_time" jdbcType="TIMESTAMP"/>
+        <result property="carTaskEndTime" column="car_task_end_time" jdbcType="TIMESTAMP"/>
         <result property="leaderId" column="leader_id" jdbcType="BIGINT"/>
         <result property="leader" column="leader" jdbcType="VARCHAR"/>
         <result property="reviewStatus" column="review_status" jdbcType="VARCHAR"/>
@@ -82,7 +87,11 @@
                t.task_no,t.task_name,t.task_status,
                t.leader_id,t.leader,
                t.task_begin_time,
+               srt.task_begin_time system_task_begin_time,
+               srt.task_end_time system_task_end_time,
                srt.task_status review_status,
+               crt.review_start_time car_task_begin_time,
+               crt.review_submit_time car_task_end_time,
                crt.review_status car_review_status,
                crt.test_status car_test_status
         FROM t_task t
@@ -90,11 +99,8 @@
         left join t_car_review_task crt on t.car_review_task_id = crt.id
         <where>
             t.task_status IN ("NEW","PENDING")
-            <if test="taskNo != null and taskNo != ''">
-                and t.task_no = #{taskNo}
-            </if>
-            <if test="taskName != null and taskName != ''">
-                and t.task_name like concat('%',#{taskName},'%')
+            <if test="taskNoOrName != null and taskNoOrName != ''">
+                and (t.task_no = #{taskNoOrName} || t.task_name like concat('%',#{taskNoOrName},'%'))
             </if>
             <if test="taskBeginTime != null and taskBeginTime != ''">
                 and t.task_begin_time = #{taskBeginTime}
@@ -112,11 +118,8 @@
         FROM t_task t
         <where>
             t.task_status IN ("FINISH")
-            <if test="taskNo != null and taskNo != ''">
-                and t.task_no = #{taskNo}
-            </if>
-            <if test="taskName != null and taskName != ''">
-                and t.task_name like concat('%',#{taskName},'%')
+            <if test="taskNoOrName != null and taskNoOrName != ''">
+                and (t.task_no = #{taskNoOrName} || t.task_name like concat('%',#{taskNoOrName},'%'))
             </if>
             <if test="taskBeginTime != null and taskBeginTime != ''">
                 and t.task_begin_time = #{taskBeginTime}