修改运单搜索条件聚合

performance-api/src/main/java/com/clx/performance/param/app/owner/PageOwnerOrderChildListParam.java

@@ -19,12 +19,10 @@ import java.util.List;
 @Getter
 @Setter
 public class PageOwnerOrderChildListParam extends PageParam {
-    @ApiModelProperty("订单编号")
-    private String orderNo;
-    @ApiModelProperty("运单编号")
-    private String childNo;
-    @ApiModelProperty("车牌号")
-    private String truckNo;
+
+    @ApiModelProperty("运单编号/车牌号/订单编号")
+    private String searchNo;
+
     @ApiModelProperty("运单状态集合")
     private List<Integer> status;
     @ApiModelProperty("开始时间")

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

@@ -515,9 +515,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public IPage<OrderChild> pageOwnerOrderChildList(PageOwnerOrderChildListParam param) {
         LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper<>();
         query.eq(OrderChild :: getOwnerUserNo,param.getOwnerUserNo());
-        if(StringUtils.isNotBlank(param.getOrderNo())){query.eq(OrderChild :: getOrderNo,param.getOrderNo());}
-        if(StringUtils.isNotBlank(param.getChildNo())){query.eq(OrderChild :: getChildNo,param.getChildNo());}
-        if(StringUtils.isNotBlank(param.getTruckNo())){query.eq(OrderChild :: getTruckNo,param.getTruckNo());}
+        if(StringUtils.isNotBlank(param.getSearchNo())){
+            query.and(i ->
+                    i.eq(OrderChild :: getChildNo,param.getSearchNo()).or()
+                            .eq(OrderChild :: getTruckNo,param.getSearchNo()).or()
+                            .eq(OrderChild :: getOrderNo,param.getSearchNo()));
+        }
         if(CollectionUtil.isNotEmpty(param.getStatus())){query.in(OrderChild :: getStatus,param.getStatus());}
         if(StringUtils.isNotBlank(param.getBeginTime())){query.ge(OrderChild :: getCreateTime,param.getBeginTime());}
         if(StringUtils.isNotBlank(param.getEndTime())){query.le(OrderChild :: getCreateTime,param.getEndTime());}