Merge remote-tracking branch 'origin/v5.5_settlement_20231011' into v5.5_settlement_20231011

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

@@ -62,6 +62,8 @@ public class OrderChildVO {
 
     @ApiModelProperty(value = "车主id", example = "1")
     private Long truckOwnUserNo;
+    @ApiModelProperty(value = "车主姓名", example = "李四")
+    private String truckOwnName;
     @ApiModelProperty(value = "车辆ID", example = "1")
     private Integer truckId;
     @ApiModelProperty(value = "车牌号", example = "京A12345")

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -88,7 +88,7 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         if(StringUtils.isNotBlank(param.getSettlementNo())){
             query.eq(SettlementOwner :: getSettlementNo,param.getSettlementNo());
         }
-        if(Objects.nonNull(param.getStatus())){
+        if(StringUtils.isNotBlank(param.getStatus())){
             query.eq(SettlementOwner :: getStatus,param.getStatus());
         }
         query.orderByDesc(SettlementOwner :: getCreateTime);

performance-web/src/main/java/com/clx/performance/model/OrderChild.java

@@ -47,6 +47,7 @@ public class OrderChild implements HasKey<Integer> {
     private LocalDateTime loadDeadline;             //最晚装货时间
 
     private Long truckOwnUserNo;                    //车主编号
+    private String truckOwnName;                    //车主姓名
     private Integer truckId;                        //车辆ID
     private String truckNo;                         //车牌号
     private BigDecimal truckLoad;                   //载重（单位吨）

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

@@ -236,6 +236,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setDriverMobile(driverTruckInfo.getMobile());
 
         orderChild.setTruckOwnUserNo(driverTruckInfo.getTruckOwnUserNo());
+        orderChild.setTruckOwnName(driverTruckInfo.getTruckOwnName());
         orderChild.setTruckId(driverTruckInfo.getTruckId());
         orderChild.setTruckNo(driverTruckInfo.getTruckNo());
         orderChild.setTruckLoad(truckLoad);

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementDriverDetailServiceImpl.java

@@ -39,7 +39,7 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
         settlementDriverDetail.setOrderNo(orderChild.getOrderNo());
 
         settlementDriverDetail.setDriverUserNo(orderChild.getTruckOwnUserNo());
-        settlementDriverDetail.setDriverName(orderChild.getOwnerName());
+        settlementDriverDetail.setDriverName(orderChild.getTruckOwnName());
         settlementDriverDetail.setTruckNo(orderChild.getTruckNo());
 
         settlementDriverDetail.setGoodsId(orderChild.getGoodsId());