Merge branch 'wangdingyi' into 'dev'

车型问卷确认

See merge request !195

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

 package com.ruoyi.web.response;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +26,10 @@ public class TaskFindResponse {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long carReviewTaskId;
 
+    @ApiModelProperty("车型检验任务id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long modelTestTaskId;
+
 
     @ApiModelProperty("标准名称（检验依据）")
     private String name;
@@ -90,8 +96,17 @@ public class TaskFindResponse {
     private Date carTaskEndTime;
 
     @ApiModelProperty("测试任务状态")
-    private String carTestStatus;
+    private String testStatus;
 
     @ApiModelProperty("测试任务进度")
-    private Double carTest;
+    private Double test;
+
+    @ApiModelProperty("测试任务开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date testBeginTime;
+
+    @ApiModelProperty("测试任务结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date testEndTime;
+
 }

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

@@ -8,6 +8,7 @@
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="systemReviewTaskId" column="system_review_task_id" jdbcType="BIGINT"/>
         <result property="carReviewTaskId" column="car_review_task_id" jdbcType="BIGINT"/>
+        <result property="modelTestTaskId" column="model_test_task_id" jdbcType="BIGINT"/>
         <result property="taskStatus" column="task_status" jdbcType="VARCHAR"/>
         <result property="runStatus" column="run_status" jdbcType="VARCHAR"/>
         <result property="taskNo" column="task_no" jdbcType="VARCHAR"/>
@@ -42,6 +43,7 @@
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="systemReviewTaskId" column="system_review_task_id" jdbcType="BIGINT"/>
         <result property="carReviewTaskId" column="car_review_task_id" jdbcType="BIGINT"/>
+        <result property="modelTestTaskId" column="model_test_task_id" jdbcType="BIGINT"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="taskNo" column="task_no" jdbcType="VARCHAR"/>
         <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
@@ -58,6 +60,9 @@
         <result property="leader" column="leader" jdbcType="VARCHAR"/>
         <result property="reviewStatus" column="review_status" jdbcType="VARCHAR"/>
         <result property="carReviewStatus" column="car_review_status" jdbcType="VARCHAR"/>
+        <result property="testStatus" column="test_status" jdbcType="VARCHAR"/>
+        <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"/>
     </resultMap>
 
@@ -83,7 +88,7 @@
         order by create_time desc
     </select>
     <select id="findPending" parameterType="com.ruoyi.web.request.TaskFindPendingRequest" resultMap="ResponseMap">
-        SELECT t.id, t.system_review_task_id, t.car_review_task_id,
+        SELECT t.id, t.system_review_task_id, t.car_review_task_id,t.model_test_task_id,
                t.task_no,t.task_name,t.task_status,t.run_status,t.name,
                t.leader_id,t.leader,
                t.task_begin_time,
@@ -94,10 +99,14 @@
                srt.task_status review_status,
                crt.task_begin_time car_task_begin_time,
                crt.task_end_time car_task_end_time,
-               crt.task_status car_review_status
+               crt.task_status car_review_status,
+               mtt.task_begin_time test_begin_time,
+               mtt.task_end_time test_end_time,
+               mtt.task_status test_status
         FROM t_task t
         left join t_system_review_task srt on t.system_review_task_id = srt.id
         left join t_car_review_task crt on t.car_review_task_id = crt.id
+        left join t_model_test_task mtt on t.model_test_task_id = mtt.id
         <where>
             t.id IN (
             SELECT task_id FROM t_task_user_relation WHERE user_id = #{userId}
@@ -122,7 +131,7 @@
         order by t.create_time desc
     </select>
     <select id="findFinish" parameterType="com.ruoyi.web.request.TaskFindFinishRequest" resultType="com.ruoyi.domain.Task">
-        SELECT t.id, t.system_review_task_id, t.car_review_task_id,
+        SELECT t.id, t.system_review_task_id, t.car_review_task_id,t.model_test_task_id,
         t.task_no,t.task_name,t.task_status,t.name,
         t.product_model,
         t.standard_no,
@@ -161,7 +170,7 @@
         WHERE system_review_task_id = #{systemReviewId}
     </select>
     <select id="findByUserId" resultMap="ResponseMap">
-        SELECT t.id, t.system_review_task_id, t.car_review_task_id,
+        SELECT t.id, t.system_review_task_id, t.car_review_task_id,t.model_test_task_id,
                t.task_no,t.task_name,t.task_status,t.run_status,t.name,
                t.product_model,
                t.leader_id,t.leader,
@@ -173,10 +182,14 @@
                srt.task_status review_status,
                crt.task_begin_time car_task_begin_time,
                crt.task_end_time car_task_end_time,
-               crt.task_status car_review_status
+               crt.task_status car_review_status,
+               mtt.task_begin_time test_begin_time,
+               mtt.task_end_time test_end_time,
+               mtt.task_status test_status
         FROM t_task t
                  left join t_system_review_task srt on t.system_review_task_id = srt.id
                  left join t_car_review_task crt on t.car_review_task_id = crt.id
+                 left join t_model_test_task mtt on t.model_test_task_id = mtt.id
         <where>
             and t.task_initiator_id = #{userId}
             and t.task_status not in ("TEMPORARILY")
@@ -202,7 +215,7 @@
         order by t.create_time desc
     </select>
     <select id="findUserFinish" parameterType="com.ruoyi.web.request.TaskFindFinishRequest" resultType="com.ruoyi.domain.Task">
-        SELECT t.id, t.system_review_task_id, t.car_review_task_id,
+        SELECT t.id, t.system_review_task_id, t.car_review_task_id,t.model_test_task_id,
         t.task_no,t.task_name,t.task_status,t.name,
         t.standard_no,
         t.product_model,
@@ -234,7 +247,7 @@
         order by t.task_begin_time desc
     </select>
     <select id="getByUserIdTemporary" resultType="com.ruoyi.domain.Task">
-        SELECT id, system_review_task_id, car_review_task_id,
+        SELECT id, system_review_task_id, car_review_task_id,model_test_task_id,
                task_status,run_status,task_no,task_name,confidentiality_level,
                product_name,product_model,
                entrusted_unit,entrusted_unit_address,entrusted_unit_phone,
@@ -247,7 +260,7 @@
         WHERE task_initiator_id = #{userId} and task_status = 'TEMPORARILY'
     </select>
     <select id="getBySubtaskId" resultType="com.ruoyi.domain.Task">
-        SELECT id, system_review_task_id, car_review_task_id,
+        SELECT id, system_review_task_id, car_review_task_id,model_test_task_id,
                task_status,run_status,task_no,task_name,confidentiality_level,
                product_name,product_model,
                entrusted_unit,entrusted_unit_address,entrusted_unit_phone,