字段修改

performance-api/src/main/java/com/clx/performance/enums/BreakContractRecordEnum.java

@@ -25,7 +25,7 @@ public enum BreakContractRecordEnum {
     }
     @Getter
     @AllArgsConstructor
-    public enum BreachContractPartyType {
+    public enum BreakContractPartyType {
         PLATFORM(1, "平台"),
         OWNER(2, "货主"),
         DRIVER(3, "司机"),
@@ -34,7 +34,7 @@ public enum BreakContractRecordEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<BreachContractPartyType> getByCode(int code) {
+        public static Optional<BreakContractPartyType> getByCode(int code) {
             return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
         }
     }

performance-api/src/main/java/com/clx/performance/enums/BreakContractSettlementDriverEnum.java

@@ -11,7 +11,7 @@ public enum BreakContractSettlementDriverEnum {
 
     @Getter
     @AllArgsConstructor
-    public enum BreachContractPartyType {
+    public enum BreakContractPartyType {
         PLATFORM(1, "平台"),
         OWNER(2, "货主"),
         DRIVER(3, "司机"),
@@ -20,12 +20,12 @@ public enum BreakContractSettlementDriverEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<BreachContractPartyType> getByCode(int code) {
+        public static Optional<BreakContractPartyType> getByCode(int code) {
             return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
         }
 
         public static String getMsgByCode(int code) {
-            return getByCode(code).map(BreachContractPartyType::getMsg).orElse(null);
+            return getByCode(code).map(BreakContractPartyType::getMsg).orElse(null);
         }
     }
 

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

@@ -24,7 +24,7 @@ public class BreakContractDriverRecordAddParam {
 
     @ApiModelProperty("违约方类型：1平台 3司机")
     @NotNull(message = "违约方类型不能为空")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约运单")
     @NotBlank(message = "违约运单不能为空")

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

@@ -24,7 +24,7 @@ public class BreakContractOwnerRecordAddParam {
 
     @ApiModelProperty("违约方类型：1平台 2货主")
     @NotNull(message = "违约方类型不能为空")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约订单")
     @NotBlank(message = "违约订单不能为空")

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/owner/PageOwnerBreakContractOwnerRecordParam.java

@@ -23,7 +23,7 @@ public class PageOwnerBreakContractOwnerRecordParam extends PageParam {
 
     @NotNull(message = "违约方类型不能为空")
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3司机", example = "1")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty(value = "缴费状态：0未缴费;1已缴费/赔付状态：0未赔付;1已赔付", example = "1")
     private Integer payStatus;

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

@@ -27,7 +27,7 @@ public class DriverBreakContractDriverRecordVO {
     private Integer triggerType;
 
     @ApiModelProperty("违约方类型：1平台 2货主 3司机")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约运单")
     private String childNo;

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

@@ -27,7 +27,7 @@ public class BreakContractDriverRecordVO {
     private Integer triggerType;
 
     @ApiModelProperty("违约方类型：1平台 2货主 3司机")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约运单")
     private String childNo;

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

@@ -27,7 +27,7 @@ public class BreakContractOwnerRecordVO {
     private Integer triggerType;
 
     @ApiModelProperty("违约方类型：1平台 2货主 3司机")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约订单")
     private String orderNo;

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

@@ -36,9 +36,9 @@ public class BreakContractOwnerRecordDaoImpl extends BaseDaoImpl<BreakContractOw
         LambdaQueryWrapper<BreakContractOwnerRecord> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractOwnerRecord :: getOrderNo,param.getOrderNo());
         query.eq(Objects.nonNull(param.getOwnerUserNo()),BreakContractOwnerRecord :: getOwnerUserNo,param.getOwnerUserNo());
-        query.eq(Objects.nonNull(param.getBreachContractPartyType()),BreakContractOwnerRecord :: getBreachContractPartyType,param.getBreachContractPartyType());
+        query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractOwnerRecord :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.eq(Objects.nonNull(param.getPayStatus()),BreakContractOwnerRecord :: getPayStatus,param.getPayStatus());
-        if(Objects.equals(param.getBreachContractPartyType(), BreakContractSettlementDriverEnum.BreachContractPartyType.PLATFORM.getCode())){
+        if(Objects.equals(param.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.PLATFORM.getCode())){
             query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractOwnerRecord:: getPayTime,param.getBeginTime());
             query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractOwnerRecord :: getPayTime,param.getEndTime());
         }else{

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

@@ -31,9 +31,9 @@ public class BreakContractDriverRecord  implements HasKey<Integer> {
     @ApiModelProperty("触发类型：1系统触发 2手动触发")
     private Integer triggerType;
 
-    @TableField("breach_contract_party_type")
+    @TableField("break_contract_party_type")
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @TableField("break_no")
     @ApiModelProperty(value = "违约单号", example = "")

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

@@ -31,9 +31,9 @@ public class BreakContractOwnerRecord   implements HasKey<Integer> {
     @ApiModelProperty("触发类型：1系统触发 2手动触发")
     private Integer triggerType;
 
-    @TableField("breach_contract_party_type")
+    @TableField("break_contract_party_type")
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @TableField("break_no")
     @ApiModelProperty(value = "违约单号", example = "")

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

@@ -71,15 +71,15 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
         BreakContractDriverRecord record = new BreakContractDriverRecord();
         record.setBreakNo(breakNo);
         record.setTriggerType(BreakContractRecordEnum.TriggerType.MANUAL.getCode());
-        if (Objects.equals(param.getBreachContractPartyType(), BreakContractRecordEnum.BreachContractPartyType.DRIVER.getCode())) {
-            record.setBreachContractPartyType(BreakContractRecordEnum.BreachContractPartyType.DRIVER.getCode());
+        if (Objects.equals(param.getBreakContractPartyType(), BreakContractRecordEnum.BreakContractPartyType.DRIVER.getCode())) {
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.DRIVER.getCode());
             if (param.getTimeLimit() != null) {
                 record.setTimeLimit(param.getTimeLimit());
                 record.setLimitTime(time.plusSeconds(param.getTimeLimit().multiply(BigDecimal.valueOf(3600L)).intValue()));
             }
         }
         else {
-            record.setBreachContractPartyType(BreakContractRecordEnum.BreachContractPartyType.PLATFORM.getCode());
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.PLATFORM.getCode());
         }
         record.setChildNo(param.getChildNo());
         record.setFigure(param.getFigure());

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

@@ -66,11 +66,11 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
         BreakContractOwnerRecord record = new BreakContractOwnerRecord();
         record.setBreakNo(breakNo);
         record.setTriggerType(BreakContractRecordEnum.TriggerType.MANUAL.getCode());
-        if (Objects.equals(param.getBreachContractPartyType(), BreakContractRecordEnum.BreachContractPartyType.OWNER.getCode())) {
-            record.setBreachContractPartyType(BreakContractRecordEnum.BreachContractPartyType.OWNER.getCode());
+        if (Objects.equals(param.getBreakContractPartyType(), BreakContractRecordEnum.BreakContractPartyType.OWNER.getCode())) {
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.OWNER.getCode());
         }
         else {
-            record.setBreachContractPartyType(BreakContractRecordEnum.BreachContractPartyType.PLATFORM.getCode());
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.PLATFORM.getCode());
         }
 
         record.setOrderNo(param.getOrderNo());

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

@@ -58,7 +58,7 @@ public class BreakContractSettlementDriverDetailServiceImpl  implements BreakCon
         fieldList.add(new ExcelField(3, "运单编号", "childNo", 5000));
 
         fieldList.add(new ExcelField(4, "司机名称", "driverName", 5000));
-        fieldList.add(new ExcelField(5, "违约方", "breachContractPartyType", 5000));
+        fieldList.add(new ExcelField(5, "违约方", "breakContractPartyType", 5000));
         fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));
         fieldList.add(new ExcelField(7, "创建人", "createName", 5000));
         fieldList.add(new ExcelField(8, "创建时间", "createTime", 5000));

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

@@ -57,7 +57,7 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
         fieldList.add(new ExcelField(3, "车主编号", "truckOwnerNo", 5000));
 
         fieldList.add(new ExcelField(4, "司机名称", "driverName", 5000));
-        fieldList.add(new ExcelField(5, "违约方", "breachContractPartyType", 5000));
+        fieldList.add(new ExcelField(5, "违约方", "breakContractPartyType", 5000));
         fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));
         fieldList.add(new ExcelField(7, "创建人", "createName", 5000));
         fieldList.add(new ExcelField(8, "创建时间", "createTime", 5000));

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

@@ -56,7 +56,7 @@ public class BreakContractSettlementOwnerDetailServiceImpl  implements BreakCont
         fieldList.add(new ExcelField(2, "货主编号", "ownUserNo", 5000));
         fieldList.add(new ExcelField(3, "货主名称", "ownerName", 5000));
 
-        fieldList.add(new ExcelField(4, "违约方", "breachContractPartyType", 5000));
+        fieldList.add(new ExcelField(4, "违约方", "breakContractPartyType", 5000));
         fieldList.add(new ExcelField(5, "违约金额", "figure", 5000));
         fieldList.add(new ExcelField(6, "创建人", "createName", 5000));
         fieldList.add(new ExcelField(7, "创建时间", "createTime", 5000));

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

@@ -73,7 +73,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         fieldList.add(new ExcelField(2, "货主编号", "ownUserNo", 5000));
         fieldList.add(new ExcelField(3, "货主名称", "ownerName", 5000));
 
-        fieldList.add(new ExcelField(4, "违约方", "breachContractPartyType", 5000));
+        fieldList.add(new ExcelField(4, "违约方", "breakContractPartyType", 5000));
         fieldList.add(new ExcelField(5, "违约金额", "figure", 5000));
         fieldList.add(new ExcelField(6, "状态", "statusMsg", 5000));
         fieldList.add(new ExcelField(7, "结算单号", "settlementNo", 5000));
@@ -209,7 +209,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         }
 
         int status = BreakContractSettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode();
-        if(Objects.equals(settlementOwner.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreachContractPartyType.PLATFORM.getCode())){
+        if(Objects.equals(settlementOwner.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.PLATFORM.getCode())){
             status = BreakContractSettlementOwnerEnum.Status.PLATFORM_TO_PAYMENT.getCode();
         }
         breakContractSettlementOwnerDao.updateStatus(param.getId(),BreakContractSettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode(),status);

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

@@ -16,7 +16,7 @@ public class BreakContractDriverRecordSqlProvider {
     public String pageByParam(@Param("page") Page<BreakContractDriverRecordVO> page, @Param("param") PageBreakContractDriverRecordParam param) {
         return new SQL(){{
 
-            SELECT(" id, trigger_type, breach_contract_party_type, break_no, " +
+            SELECT(" id, trigger_type, break_contract_party_type, break_no, " +
                     " 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, " +
@@ -41,7 +41,7 @@ public class BreakContractDriverRecordSqlProvider {
     public String driverPageByParam(@Param("page") Page<DriverBreakContractDriverRecordVO> page, @Param("param") DriverPageBreakContractDriverRecordParam param) {
         return new SQL(){{
 
-            SELECT(" id, trigger_type, breach_contract_party_type, break_no, " +
+            SELECT(" id, trigger_type, break_contract_party_type, break_no, " +
                     " 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, " +
@@ -54,8 +54,8 @@ public class BreakContractDriverRecordSqlProvider {
 
             FROM("break_contract_driver_record");
             WHERE("(truck_own_user_no = #{param.userNo} or driver_user_no = #{param.userNo})");
-            if (Objects.equals(param.getType(), 1)) {WHERE("breach_contract_party_type = 3");}
-            if (Objects.equals(param.getType(), 2)) {WHERE("breach_contract_party_type = 1");}
+            if (Objects.equals(param.getType(), 1)) {WHERE("break_contract_party_type = 3");}
+            if (Objects.equals(param.getType(), 2)) {WHERE("break_contract_party_type = 1");}
 
             if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
             if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}

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

@@ -12,7 +12,7 @@ public class BreakContractOwnerRecordSqlProvider {
     public String pageByParam(@Param("page") Page<BreakContractOwnerRecordVO> page, @Param("param") PageBreakContractOwnerRecordParam param) {
         return new SQL(){{
 
-            SELECT(" id, trigger_type, breach_contract_party_type, break_no, " +
+            SELECT(" id, trigger_type, break_contract_party_type, break_no, " +
                     " order_no, owner_user_no, owner_name, figure, " +
                     " settlement_no, " +
                     " remark, " +

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

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

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

@@ -20,7 +20,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 = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.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 = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     PageCarrierBreakContractSettlementOwnerDetailVO convert(BreakContractSettlementOwnerDetail detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")

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

@@ -19,14 +19,14 @@ public interface BreakContractSettlementOwnerStruct {
 
 
     @Named("toBaseVo")
-    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     @Mapping(target = "statusMsg", expression = "java(BreakContractSettlementOwnerEnum.Status.getMsgByCode(detail.getStatus()))")
     PageCarrierBreakContractSettlementOwnerVO convert(BreakContractSettlementOwner detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")
     List<PageCarrierBreakContractSettlementOwnerVO> covertToCarrierList(List<BreakContractSettlementOwner> list);
 
-    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(settlementOwner.getBreakContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(settlementOwner.getBreakContractPartyType()))")
     @Mapping(target = "statusMsg", expression = "java(BreakContractSettlementOwnerEnum.Status.getMsgByCode(settlementOwner.getStatus()))")
     CarrierBreakContractSettlementOwnerDetailVO convertToDetail(BreakContractSettlementOwner settlementOwner);