Merge branch 'dev' into wangfei

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

@@ -23,6 +23,10 @@ public class TaskFindResponse {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long carReviewTaskId;
 
+
+    @ApiModelProperty("标准名称（检验依据）")
+    private String name;
+
     @ApiModelProperty("任务编号")
     private String taskNo;
 

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

@@ -40,6 +40,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="name" column="name" jdbcType="VARCHAR"/>
         <result property="taskNo" column="task_no" jdbcType="VARCHAR"/>
         <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
         <result property="productModel" column="product_model" jdbcType="VARCHAR"/>
@@ -81,7 +82,7 @@
     </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,
-               t.task_no,t.task_name,t.task_status,
+               t.task_no,t.task_name,t.task_status,t.name,
                t.leader_id,t.leader,
                t.task_begin_time,
                t.product_model,
@@ -161,7 +162,7 @@
     </select>
     <select id="findByUserId" resultMap="ResponseMap">
         SELECT t.id, t.system_review_task_id, t.car_review_task_id,
-               t.task_no,t.task_name,t.task_status,
+               t.task_no,t.task_name,t.task_status,t.name,
                t.product_model,
                t.leader_id,t.leader,
                t.task_begin_time,