Merge branch 'dev' into wangfei

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

@@ -44,6 +44,9 @@ public class TaskFindResponse {
     @ApiModelProperty("总任务开始时间")
     private Date taskBeginTime;
 
+    @ApiModelProperty("任务结束时间")
+    private Date taskEndTime;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @ApiModelProperty("审核组长id")
     private Long leaderId;

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

@@ -47,6 +47,7 @@
         <result property="runStatus" column="run_status" jdbcType="VARCHAR"/>
         <result property="nextNode" column="next_node" jdbcType="VARCHAR"/>
         <result property="taskBeginTime" column="task_begin_time" jdbcType="TIMESTAMP"/>
+        <result property="taskEndTime" column="task_end_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"/>
@@ -164,6 +165,7 @@
                t.product_model,
                t.leader_id,t.leader,
                t.task_begin_time,
+               t.task_end_time,
                t.next_node,
                srt.task_begin_time system_task_begin_time,
                srt.task_end_time system_task_end_time,