Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/domain/CarReviewTask.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.StandardJsonTypeHandler;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -16,7 +18,7 @@ import lombok.experimental.Accessors;
  * 车型审查任务
  * @TableName t_car_review_task
  */
-@TableName(value ="t_car_review_task")
+@TableName(value ="t_car_review_task", autoResultMap = true)
 @Accessors(chain = true)
 @Data
 public class CarReviewTask implements Serializable {
@@ -101,7 +103,8 @@ public class CarReviewTask implements Serializable {
      * 审查标准
      */
     @ApiModelProperty("审查标准")
-    private Object standard;
+    @TableField(value="standard", typeHandler = StandardJsonTypeHandler. class)
+    private List<ReviewStandard> standard;
 
     /**
      * 占位（开发人员根据具体业务自行增加业务字段）

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

 package com.ruoyi.web.response;
 
-import com.ruoyi.domain.CarReviewTask;
-import com.ruoyi.domain.ReviewSceneChangeTask;
+import com.ruoyi.domain.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @ApiModel(value = "CarReviewTaskViewResponse", description = "查询车辆审查任务详情响应体")
@@ -23,4 +23,24 @@ public class CarReviewTaskViewResponse {
      */
     @ApiModelProperty("任务开始后的场景变更信息")
     private List<ReviewSceneChangeTask> reviewSceneChangeTasks;
+
+    /**
+     *
+     * @return
+     */
+    @ApiModelProperty("细则列表")
+    public List<ReviewDetails> getDetailsList() {
+
+        List<ReviewDetails> detailsList = new ArrayList();
+
+        for(ReviewStandard standard : carReviewTask.getStandard()) {
+            for(ReviewKeyPoint keyPoint : standard.getKeyPointList()) {
+                for(ReviewDetails details : keyPoint.getReviewDetailsList()) {
+                    detailsList.add(details);
+                }
+            }
+        }
+
+        return detailsList;
+    }
 }

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

@@ -13,7 +13,7 @@
             <result property="taskResult" column="task_result" jdbcType="VARCHAR"/>
             <result property="taskBeginTime" column="task_begin_time" jdbcType="TIMESTAMP"/>
             <result property="taskEndTime" column="task_end_time" jdbcType="TIMESTAMP"/>
-            <result property="standard" column="standard" jdbcType="OTHER"/>
+            <result property="standard" column="standard" typeHandler="com.ruoyi.common.StandardJsonTypeHandler"/>
             <result property="bizInfo" column="biz_info" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="leaderId" column="leader_id" jdbcType="BIGINT"/>