commit

clx-performance-web/src/main/java/com/clx/performance/sqlProvider/breakcontract/BreakContractDriverRecordSqlProvider.java

@@ -20,8 +20,8 @@ public class BreakContractDriverRecordSqlProvider {
                     " child_no, truck_no, truck_own_user_no, truck_own_name, " +
                     " driver_user_no, driver_name, figure, time_limit, " +
                     " date_format(limit_time, '%Y-%m-%d %H:%i:%s') as limitTime, " +
-                    " settlement_no, " +
-                    " remark, " +
+                    " settlement_no,exception_report_no,exception_category,exception_type," +
+                    " remark,picture_url,video_url, " +
                     " create_by, create_name, " +
                     " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
                     " date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "

performance-api/src/main/java/com/clx/performance/vo/app/breakcontract/DriverBreakContractDriverRecordVO.java

@@ -23,7 +23,7 @@ public class DriverBreakContractDriverRecordVO {
     @Schema(description="id")
     private Integer id;
 
-    @Schema(description="触发类型：1系统触发 2手动触发")
+    @Schema(description="触发类型：1系统触发 2手动触发  3.异常上报")
     private Integer triggerType;
 
     @Schema(description="违约方类型：1平台 2货主 3司机")

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/BreakContractDriverRecordVO.java

 package com.clx.performance.vo.pc.breakcontract.carrier;
 
+import com.alibaba.fastjson.JSON;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
@@ -8,6 +9,8 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * @author liruixin
@@ -23,7 +26,7 @@ public class BreakContractDriverRecordVO {
     @Schema(description="id")
     private Integer id;
 
-    @Schema(description="触发类型：1系统触发 2手动触发")
+    @Schema(description="触发类型：1系统触发 2手动触发 3.异常上报")
     private Integer triggerType;
 
     @Schema(description="违约方类型：1平台 2货主 3司机")
@@ -60,9 +63,52 @@ public class BreakContractDriverRecordVO {
     @Schema(description="结算单编号")
     private String settlementNo;
 
-    @Schema(description="备注")
+    @Schema(description="违约原因")
     private String remark;
 
+    @Schema(description="异常上报单号")
+    private String exceptionReportNo;
+
+    @Schema(description="异常类别")
+    private String exceptionCategory;
+
+    @Schema(description="异常类型")
+    private String exceptionType;
+
+
+    @Schema(description="图片字地址符串")
+    private String pictureUrl;
+
+    @Schema(description="视频地址字符串")
+    private String videoUrl;
+
+
+    @Schema(description="图片")
+    private List<String> pictureUrlList;
+
+    public List<String> getPictureUrlList(){
+        if(Objects.nonNull(pictureUrl)){
+            return JSON.parseArray(pictureUrl,String.class);
+        }
+        return null;
+    }
+
+    @Schema(description="视频")
+    private List<String> videoUrlList;
+
+
+    public List<String> getVideoUrlList(){
+        if(Objects.nonNull(videoUrl)){
+            return JSON.parseArray(videoUrl,String.class);
+        }
+        return null;
+    }
+
+
+
+    @Schema(description = "操作人名称", example = "")
+    private String createName;
+
     @Schema(description="创建时间")
     private String createTime;