model字段修改

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementDriver.java

@@ -27,10 +27,6 @@ public class BreakContractSettlementDriver  implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("breach_contract_type")
-    @ApiModelProperty("违约类型：1司机违约 2平台违约")
-    private Integer breachContractType;
-
     @TableField("breach_contract_party_type")
     @ApiModelProperty("违约方类型：1平台 2货主 3司机")
     private Integer breachContractPartyType;
@@ -39,12 +35,20 @@ public class BreakContractSettlementDriver  implements HasKey<Integer> {
     @ApiModelProperty("结算单编号")
     private String settlementNo;
 
-    @TableField("driver_user_no")
+    @TableField("truck_own_user_no")
     @ApiModelProperty("车主用户编号")
+    private Long truckOwnUserNo;
+
+    @TableField("truck_own_name")
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @TableField("driver_user_no")
+    @ApiModelProperty("司机用户编号")
     private Long driverUserNo;
 
     @TableField("driver_name")
-    @ApiModelProperty("车主名称")
+    @ApiModelProperty("司机名称")
     private String driverName;
 
     @TableField("child_no")
@@ -55,9 +59,29 @@ public class BreakContractSettlementDriver  implements HasKey<Integer> {
     @ApiModelProperty("违约金（分）")
     private BigDecimal figure;
 
-    @TableField("status")
-    @ApiModelProperty("状态")
-    private Integer status;
+    @TableField("break_contract_remark")
+    @ApiModelProperty("违约说明")
+    private String breakContractRemark;
+
+    @TableField("settle_status")
+    @ApiModelProperty("结算状态 0待结算;1已结算")
+    private Integer settleStatus;
+
+    @TableField("settle_platform")
+    @ApiModelProperty("结算平台 0马上来")
+    private Integer settlePlatform;
+
+    @TableField("settle_time")
+    @ApiModelProperty("结算时间")
+    private LocalDateTime settleTime;
+
+    @TableField("create_by")
+    @ApiModelProperty("操作人编号")
+    private Long createBy;
+
+    @TableField("create_name")
+    @ApiModelProperty("操作人名称")
+    private String createName;
 
     @TableField("create_time")
     @ApiModelProperty("创建时间")

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementDriverDetail.java

@@ -31,16 +31,28 @@ public class BreakContractSettlementDriverDetail  implements HasKey<Integer> {
     @ApiModelProperty("违约方类型：1平台 2货主 3司机")
     private Integer breachContractPartyType;
 
+    @TableField("break_no")
+    @ApiModelProperty("违约单号")
+    private String breakNo;
+
     @TableField("settlement_no")
     @ApiModelProperty("结算单号")
     private String settlementNo;
 
-    @TableField("driver_user_no")
+    @TableField("truck_own_user_no")
     @ApiModelProperty("车主用户编号")
+    private Long truckOwnUserNo;
+
+    @TableField("truck_own_name")
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @TableField("driver_user_no")
+    @ApiModelProperty("司机用户编号")
     private Long driverUserNo;
 
     @TableField("driver_name")
-    @ApiModelProperty("车主名称")
+    @ApiModelProperty("司机名称")
     private String driverName;
 
     @TableField("child_no")
@@ -52,21 +64,21 @@ public class BreakContractSettlementDriverDetail  implements HasKey<Integer> {
     private BigDecimal figure;
 
     @TableField("breach_contract_remark")
-    @ApiModelProperty("违约原因")
+    @ApiModelProperty("违约说明")
     private String breachContractRemark;
 
     @TableField("status")
     @ApiModelProperty("状态")
     private Integer status;
 
-    @TableField("create_type")
-    @ApiModelProperty("操作人类型1-货主， 2-承运端，3-司机")
-    private Integer createType;
-
     @TableField("create_by")
     @ApiModelProperty("操作人编号")
     private Long createBy;
 
+    @TableField("create_name")
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
     @TableField("create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementOwner.java

@@ -10,6 +10,8 @@ import lombok.Setter;
 import lombok.experimental.Accessors;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -30,10 +32,6 @@ public class BreakContractSettlementOwner  implements HasKey<Integer> {
     @ApiModelProperty("违约方类型：1平台 2货主 3司机")
     private Integer breachContractPartyType;
 
-    @TableField("breach_contract_type")
-    @ApiModelProperty("违约类型：1司机违约 2平台违约")
-    private Integer breachContractType;
-
     @TableField("settlement_no")
     @ApiModelProperty("结算单编号")
     private String settlementNo;
@@ -50,6 +48,10 @@ public class BreakContractSettlementOwner  implements HasKey<Integer> {
     @ApiModelProperty("订单编号")
     private String orderNo;
 
+    @TableField("figure")
+    @ApiModelProperty("违约金（分）")
+    private BigDecimal figure;
+
     @TableField("invoice_img")
     @ApiModelProperty("结算凭证")
     private String invoiceImg;
@@ -82,9 +84,21 @@ public class BreakContractSettlementOwner  implements HasKey<Integer> {
     @ApiModelProperty("状态")
     private Integer status;
 
-    @TableField("remark")
-    @ApiModelProperty("驳回原因")
-    private String remark;
+    @TableField("breach_contract_remark")
+    @ApiModelProperty("违约说明")
+    private String breachContractRemark;
+
+    @TableField("create_by")
+    @ApiModelProperty("操作人编号")
+    private Long createBy;
+
+    @TableField("create_name")
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @TableField("delete_status")
+    @ApiModelProperty("删除状态 0-否；1-是")
+    private Integer deleteStatus;
 
     @TableField("create_time")
     @ApiModelProperty("创建时间")

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementOwnerDetail.java

@@ -27,9 +27,13 @@ public class BreakContractSettlementOwnerDetail  implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("breach_contract_type")
-    @ApiModelProperty("违约类型：1司机违约 2平台违约")
-    private Integer breachContractType;
+    @TableField("breach_contract_party_type")
+    @ApiModelProperty("违约方类型：1平台 2货主 3司机")
+    private Integer breachContractPartyType;
+
+    @TableField("break_no")
+    @ApiModelProperty("违约单号")
+    private String breakNo;
 
     @TableField("settlement_no")
     @ApiModelProperty("结算单号")
@@ -52,21 +56,21 @@ public class BreakContractSettlementOwnerDetail  implements HasKey<Integer> {
     private BigDecimal figure;
 
     @TableField("breach_contract_remark")
-    @ApiModelProperty("违约原因")
+    @ApiModelProperty("违约说明")
     private String breachContractRemark;
 
     @TableField("status")
     @ApiModelProperty("状态")
     private Integer status;
 
-    @TableField("create_type")
-    @ApiModelProperty("操作人类型1-货主， 2-承运端，3-司机")
-    private Integer createType;
-
     @TableField("create_by")
     @ApiModelProperty("操作人编号")
     private Long createBy;
 
+    @TableField("create_name")
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
     @TableField("create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;