字段筛选

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

@@ -32,8 +32,8 @@ public enum BreakContractSettlementDriverEnum {
     @Getter
     @AllArgsConstructor
     public enum SettleStatus {
-        NO(0, "待结算"),
-        YES(1, "已结算"),
+        NO(1, "待结算"),
+        YES(2, "已结算"),
         ;
 
         private final Integer code;

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

@@ -20,6 +20,12 @@ public class PageCarrierBreakContractSettlementDriverParam extends PageParam {
     @ApiModelProperty(value="车主编号",example = "201457878")
     private Long truckOwnUserNo;
 
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @ApiModelProperty("结算状态 1待结算;2已结算")
+    private Integer settleStatus;
+
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
     private Integer breakContractPartyType;
 

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

@@ -27,6 +27,9 @@ public class PageCarrierBreakContractSettlementDriverVO {
     @ApiModelProperty("车主用户编号")
     private Long truckOwnUserNo;
 
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
     @ApiModelProperty("司机名称")
     private String driverName;
 
@@ -39,10 +42,10 @@ public class PageCarrierBreakContractSettlementDriverVO {
     @ApiModelProperty("违约说明")
     private String breakContractRemark;
 
-    @ApiModelProperty("结算状态 0待结算;1已结算")
+    @ApiModelProperty("结算状态 1待结算;2已结算")
     private String settleStatusMsg;
 
-    @ApiModelProperty("结算状态 0待结算;1已结算")
+    @ApiModelProperty("结算状态 1待结算;2已结算")
     private Integer settleStatus;
 
     @ApiModelProperty("结算平台 0马上来")

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

@@ -23,13 +23,17 @@ import java.util.Objects;
 public class BreakContractSettlementDriverDaoImpl extends BaseDaoImpl<BreakContractSettlementDriverMapper, BreakContractSettlementDriver, Integer> implements BreakContractSettlementDriverDao {
     @Override
     public IPage<BreakContractSettlementDriver> pageCarrierBreakContractSettlementDriverList(PageCarrierBreakContractSettlementDriverParam param) {
+
         LambdaQueryWrapper<BreakContractSettlementDriver> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getChildNo()),BreakContractSettlementDriver :: getChildNo,param.getChildNo());
+        query.eq(StringUtils.isNotBlank(param.getTruckOwnName()),BreakContractSettlementDriver :: getTruckOwnName,param.getTruckOwnName());
+        query.eq(Objects.nonNull(param.getSettleStatus()),BreakContractSettlementDriver :: getSettleStatus,param.getSettleStatus());
         query.eq(Objects.nonNull(param.getTruckOwnUserNo()),BreakContractSettlementDriver :: getTruckOwnUserNo,param.getTruckOwnUserNo());
         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);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
+
     }
 }

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

@@ -68,7 +68,7 @@ public class BreakContractSettlementDriver  implements HasKey<Integer> {
     private String breakContractRemark;
 
     @TableField("settle_status")
-    @ApiModelProperty("结算状态 0待结算;1已结算")
+    @ApiModelProperty("结算状态 1待结算;2已结算")
     private Integer settleStatus;
 
     @TableField("settle_platform")