字段名称修改

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverDetailParam.java

@@ -21,6 +21,6 @@ public class PageCarrierBreakContractSettlementDriverDetailParam extends PagePar
     private Long truckOwnUserNo;
 
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
 }

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverParam.java

@@ -21,7 +21,7 @@ public class PageCarrierBreakContractSettlementDriverParam extends PageParam {
     private Long truckOwnUserNo;
 
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty(value="开始时间",example = "2012-01-01 00:00:00")
     private String beginTime;

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerDetailParam.java

@@ -21,6 +21,6 @@ public class PageCarrierBreakContractSettlementOwnerDetailParam extends PagePara
     private Long ownerUserNo;
 
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
 }

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerParam.java

@@ -21,7 +21,7 @@ public class PageCarrierBreakContractSettlementOwnerParam extends PageParam {
     private String settlementNo;
 
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty(value="开始时间",example = "2012-01-01 00:00:00")
     private String beginTime;

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

@@ -17,10 +17,10 @@ import java.math.BigDecimal;
 public class PageCarrierBreakContractSettlementDriverDetailVO {
 
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
-    private String breachContractPartyTypeMsg;
+    private String breakContractPartyTypeMsg;
 
     @ApiModelProperty("违约单号")
     private String breakNo;
@@ -42,7 +42,7 @@ public class PageCarrierBreakContractSettlementDriverDetailVO {
     private BigDecimal figure;
 
     @ApiModelProperty("违约说明")
-    private String breachContractRemark;
+    private String breakContractRemark;
 
     @ApiModelProperty("操作人名称")
     private String createName;

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

@@ -16,10 +16,10 @@ import java.math.BigDecimal;
 public class PageCarrierBreakContractSettlementDriverVO {
 
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
-    private String breachContractPartyTypeMsg;
+    private String breakContractPartyTypeMsg;
 
     @ApiModelProperty("结算单编号")
     private String settlementNo;

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

@@ -16,10 +16,10 @@ import java.math.BigDecimal;
 public class PageCarrierBreakContractSettlementOwnerDetailVO {
 
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
-    private String breachContractPartyTypeMsg;
+    private String breakContractPartyTypeMsg;
 
     @ApiModelProperty("违约单号")
     private String breakNo;
@@ -40,7 +40,7 @@ public class PageCarrierBreakContractSettlementOwnerDetailVO {
     private BigDecimal figure;
 
     @ApiModelProperty("违约说明")
-    private String breachContractRemark;
+    private String breakContractRemark;
 
     @ApiModelProperty("操作人名称")
     private String createName;

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

@@ -16,10 +16,10 @@ import java.math.BigDecimal;
 public class PageCarrierBreakContractSettlementOwnerVO {
 
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
-    private String breachContractPartyTypeMsg;
+    private String breakContractPartyTypeMsg;
 
     @ApiModelProperty("结算单号")
     private String settlementNo;

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementDriverDaoImpl.java

@@ -26,7 +26,7 @@ public class BreakContractSettlementDriverDaoImpl extends BaseDaoImpl<BreakContr
         LambdaQueryWrapper<BreakContractSettlementDriver> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getChildNo()),BreakContractSettlementDriver :: getChildNo,param.getChildNo());
         query.eq(Objects.nonNull(param.getTruckOwnUserNo()),BreakContractSettlementDriver :: getTruckOwnUserNo,param.getTruckOwnUserNo());
-        query.eq(Objects.nonNull(param.getBreachContractPartyType()),BreakContractSettlementDriver :: getBreachContractPartyType,param.getBreachContractPartyType());
+        query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementDriver :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.ge(StringUtils.isNotBlank(param.getBeginTime()),BreakContractSettlementDriver :: getCreateTime,param.getBeginTime());
         query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractSettlementDriver :: getCreateTime,param.getEndTime());
         query.orderByDesc(BreakContractSettlementDriver::getId);

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementDriverDetailDaoImpl.java

@@ -28,7 +28,7 @@ public class BreakContractSettlementDriverDetailDaoImpl extends BaseDaoImpl<Brea
         LambdaQueryWrapper<BreakContractSettlementDriverDetail> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getChildNo()),BreakContractSettlementDriverDetail :: getChildNo,param.getChildNo());
         query.eq(Objects.nonNull(param.getTruckOwnUserNo()),BreakContractSettlementDriverDetail :: getTruckOwnUserNo,param.getTruckOwnUserNo());
-        query.eq(Objects.nonNull(param.getBreachContractPartyType()),BreakContractSettlementDriverDetail :: getBreachContractPartyType,param.getBreachContractPartyType());
+        query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementDriverDetail :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.orderByDesc(BreakContractSettlementDriverDetail::getId);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDaoImpl.java

@@ -26,7 +26,7 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
         LambdaQueryWrapper<BreakContractSettlementOwner> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractSettlementOwner :: getOrderNo,param.getOrderNo());
         query.eq(StringUtils.isNotBlank(param.getSettlementNo()),BreakContractSettlementOwner ::getSettlementNo ,param.getSettlementNo());
-        query.eq(Objects.nonNull(param.getBreachContractPartyType()),BreakContractSettlementOwner :: getBreachContractPartyType,param.getBreachContractPartyType());
+        query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementOwner :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractSettlementOwner:: getCreateTime,param.getBeginTime());
         query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractSettlementOwner :: getCreateTime,param.getEndTime());
         query.orderByDesc(BreakContractSettlementOwner::getId);

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDetailDaoImpl.java

@@ -26,7 +26,7 @@ public class BreakContractSettlementOwnerDetailDaoImpl extends BaseDaoImpl<Break
         LambdaQueryWrapper<BreakContractSettlementOwnerDetail> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractSettlementOwnerDetail :: getOrderNo,param.getOrderNo());
         query.eq(Objects.nonNull(param.getOwnerUserNo()),BreakContractSettlementOwnerDetail ::getOwnerUserNo ,param.getOwnerUserNo());
-        query.eq(Objects.nonNull(param.getBreachContractPartyType()),BreakContractSettlementOwnerDetail :: getBreachContractPartyType,param.getBreachContractPartyType());
+        query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementOwnerDetail :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.orderByDesc(BreakContractSettlementOwnerDetail::getId);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }

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

@@ -27,9 +27,9 @@ public class BreakContractSettlementDriver  implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("breach_contract_party_type")
+    @TableField("break_contract_party_type")
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @TableField("settlement_no")
     @ApiModelProperty("结算单编号")

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

@@ -27,9 +27,9 @@ public class BreakContractSettlementDriverDetail  implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("breach_contract_party_type")
+    @TableField("break_contract_party_type")
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @TableField("break_no")
     @ApiModelProperty("违约单号")
@@ -63,9 +63,9 @@ public class BreakContractSettlementDriverDetail  implements HasKey<Integer> {
     @ApiModelProperty("违约金（分）")
     private BigDecimal figure;
 
-    @TableField("breach_contract_remark")
+    @TableField("break_contract_remark")
     @ApiModelProperty("违约说明")
-    private String breachContractRemark;
+    private String breakContractRemark;
 
 
     @TableField("create_by")

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

@@ -28,9 +28,9 @@ public class BreakContractSettlementOwner  implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("breach_contract_party_type")
+    @TableField("break_contract_party_type")
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @TableField("settlement_no")
     @ApiModelProperty("结算单编号")
@@ -84,9 +84,9 @@ public class BreakContractSettlementOwner  implements HasKey<Integer> {
     @ApiModelProperty("状态")
     private Integer status;
 
-    @TableField("breach_contract_remark")
+    @TableField("break_contract_remark")
     @ApiModelProperty("违约说明")
-    private String breachContractRemark;
+    private String breakContractRemark;
 
     @TableField("create_by")
     @ApiModelProperty("操作人编号")

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

@@ -27,9 +27,9 @@ public class BreakContractSettlementOwnerDetail  implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("breach_contract_party_type")
+    @TableField("break_contract_party_type")
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @TableField("break_no")
     @ApiModelProperty("违约单号")
@@ -55,9 +55,9 @@ public class BreakContractSettlementOwnerDetail  implements HasKey<Integer> {
     @ApiModelProperty("违约金（分）")
     private BigDecimal figure;
 
-    @TableField("breach_contract_remark")
+    @TableField("break_contract_remark")
     @ApiModelProperty("违约说明")
-    private String breachContractRemark;
+    private String breakContractRemark;
 
     @TableField("create_by")
     @ApiModelProperty("操作人编号")

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementDriverDetailServiceImpl.java

@@ -77,7 +77,7 @@ public class BreakContractSettlementDriverDetailServiceImpl  implements BreakCon
             rowData.add(new ExcelData(dto.getChildNo()));
 
             rowData.add(new ExcelData(dto.getDriverName()));
-            rowData.add(new ExcelData(dto.getBreachContractPartyTypeMsg()));
+            rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));
             rowData.add(new ExcelData(dto.getFigure().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getCreateName()));
             rowData.add(new ExcelData(dto.getCreateTime()));

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementDriverServiceImpl.java

@@ -78,7 +78,7 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
             rowData.add(new ExcelData(dto.getTruckOwnUserNo()+""));
 
             rowData.add(new ExcelData(dto.getDriverName()));
-            rowData.add(new ExcelData(dto.getBreachContractPartyTypeMsg()));
+            rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));
             rowData.add(new ExcelData(dto.getFigure().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getCreateName()));
             rowData.add(new ExcelData(dto.getCreateTime()));

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerDetailServiceImpl.java

@@ -75,7 +75,7 @@ public class BreakContractSettlementOwnerDetailServiceImpl  implements BreakCont
             rowData.add(new ExcelData(dto.getOwnerUserNo()+""));
             rowData.add(new ExcelData(dto.getOwnerName()));
 
-            rowData.add(new ExcelData(dto.getBreachContractPartyTypeMsg()));
+            rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));
             rowData.add(new ExcelData(dto.getFigure().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getCreateName()));
             rowData.add(new ExcelData(dto.getCreateTime()));

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerServiceImpl.java

@@ -78,7 +78,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
             rowData.add(new ExcelData(dto.getOwnerUserNo()+""));
             rowData.add(new ExcelData(dto.getOwnerName()));
 
-            rowData.add(new ExcelData(dto.getBreachContractPartyTypeMsg()));
+            rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));
             rowData.add(new ExcelData(dto.getFigure().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getStatusMsg()));
             rowData.add(new ExcelData(dto.getSettlementNo()));

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementDriverDetailStruct.java

@@ -17,7 +17,7 @@ public interface BreakContractSettlementDriverDetailStruct {
 
 
     @Named("toBaseVo")
-    @Mapping(target = "breachContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreachContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     PageCarrierBreakContractSettlementDriverDetailVO convert(BreakContractSettlementDriverDetail detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementDriverStruct.java

@@ -19,7 +19,7 @@ public interface BreakContractSettlementDriverStruct {
     @Named("toBaseVo")
     @Mapping(target = "settleStatusMsg", expression = "java(BreakContractSettlementDriverEnum.SettleStatus.getMsgByCode(detail.getSettleStatus()))")
     @Mapping(target = "settlePlatformMsg", expression = "java(BreakContractSettlementDriverEnum.SettlePlatform.getMsgByCode(detail.getSettlePlatform()))")
-    @Mapping(target = "breachContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreachContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     PageCarrierBreakContractSettlementDriverVO convert(BreakContractSettlementDriver detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementOwnerDetailStruct.java

@@ -19,7 +19,7 @@ public interface BreakContractSettlementOwnerDetailStruct {
 
 
     @Named("toBaseVo")
-    @Mapping(target = "breachContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreachContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     PageCarrierBreakContractSettlementOwnerDetailVO convert(BreakContractSettlementOwnerDetail detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementOwnerStruct.java

@@ -18,7 +18,7 @@ public interface BreakContractSettlementOwnerStruct {
 
 
     @Named("toBaseVo")
-    @Mapping(target = "breachContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreachContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     @Mapping(target = "statusMsg", expression = "java(BreakContractSettlementOwnerEnum.Status.getMsgByCode(detail.getStatus()))")
     PageCarrierBreakContractSettlementOwnerVO convert(BreakContractSettlementOwner detail);