修改app运单列表单证审核和已完成的过滤

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderQueryParam.java

@@ -33,6 +33,12 @@ public class WaybillOrderQueryParam extends PageReq implements Serializable {
     @Schema(description = "车牌号")
     private String truckNo;
 
+    /**
+     * 司机id
+     */
+    @Schema(description = "司机id")
+    private Long driverId;
+
     /**
      * 状态 （1-进行中、2-单证审核、3-已完成）
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -508,19 +508,21 @@ public class WaybillOrderService {
     private static LambdaQueryWrapper<KwtWaybillOrder> buildBaseQueryWrapper(WaybillOrderQueryParam param) {
         LambdaQueryWrapper<KwtWaybillOrder> queryWrapper = Wrappers.<KwtWaybillOrder>lambdaQuery()
                 .eq(KwtWaybillOrder::getEntId, param.getEntId())
-                .eq(KwtWaybillOrder::getTruckNo, param.getTruckNo())
                 .eq(KwtWaybillOrder::getDelFlag, 0)
                 .orderByDesc(KwtWaybillOrder::getCreateTime)
                 .orderByDesc(KwtWaybillOrder::getId);
         //进行中
         if (Objects.equals(param.getStatus(), Global.NUMERICAL_ONE)) {
             queryWrapper.in(KwtWaybillOrder::getStatus, UNDER_WAY);
+            queryWrapper.eq(KwtWaybillOrder::getTruckNo, param.getTruckNo());
         } else if (Objects.equals(param.getStatus(), Global.NUMERICAL_TWO)) {
             //单证审核
             queryWrapper.in(KwtWaybillOrder::getStatus, REVIEW);
+            queryWrapper.eq(KwtWaybillOrder::getDriverId, param.getDriverId());
         } else if (Objects.equals(param.getStatus(), Global.NUMERICAL_THREE)) {
             //已完成
             queryWrapper.in(KwtWaybillOrder::getStatus, COMPLETED);
+            queryWrapper.eq(KwtWaybillOrder::getDriverId, param.getDriverId());
         }
         return queryWrapper;
     }
@@ -574,13 +576,20 @@ public class WaybillOrderService {
      */
     private void addMatchedIdsFromWaybillNo(String keyword, WaybillOrderQueryParam param, Set<Long> waybillOrderIds) {
         // 1. 运单编号查询（主表字段，直接匹配）
-        List<KwtWaybillOrder> waybillOrders = waybillOrderRepository.list(
-                Wrappers.<KwtWaybillOrder>lambdaQuery()
-                        .like(KwtWaybillOrder::getWOrderNo, keyword)
-                        .eq(KwtWaybillOrder::getEntId, param.getEntId())
-                        .eq(KwtWaybillOrder::getTruckNo, param.getTruckNo())
-                        .eq(KwtWaybillOrder::getDelFlag, 0)
-        );
+        LambdaQueryWrapper<KwtWaybillOrder> wrapper = Wrappers.<KwtWaybillOrder>lambdaQuery()
+                .like(KwtWaybillOrder::getWOrderNo, keyword)
+                .eq(KwtWaybillOrder::getEntId, param.getEntId())
+                .eq(KwtWaybillOrder::getDelFlag, 0);
+
+        if (Objects.equals(param.getStatus(), Global.NUMERICAL_ONE)) {
+            //进行中
+            wrapper.eq(KwtWaybillOrder::getTruckNo, param.getTruckNo());
+        } else if (Objects.equals(param.getStatus(), Global.NUMERICAL_TWO) || Objects.equals(param.getStatus(), Global.NUMERICAL_THREE)) {
+            //单证审核、已完成
+            wrapper.eq(KwtWaybillOrder::getDriverId, param.getDriverId());
+        }
+
+        List<KwtWaybillOrder> waybillOrders = waybillOrderRepository.list(wrapper);
         waybillOrderIds.addAll(waybillOrders.stream()
                 .map(KwtWaybillOrder::getId)
                 .collect(Collectors.toList()));
@@ -601,9 +610,20 @@ public class WaybillOrderService {
                     .map(KwtLogisticsOrder::getId)
                     .collect(Collectors.toList());
 
+            LambdaQueryWrapper<KwtWaybillOrder> wrapper = Wrappers.<KwtWaybillOrder>lambdaQuery()
+                    .in(KwtWaybillOrder::getLOrderId, matchedLogOrderIds)
+                    .eq(KwtWaybillOrder::getEntId, param.getEntId())
+                    .eq(KwtWaybillOrder::getDelFlag, 0);
+            if (Objects.equals(param.getStatus(), Global.NUMERICAL_ONE)) {
+                //进行中
+                wrapper.eq(KwtWaybillOrder::getTruckNo, param.getTruckNo());
+            } else if (Objects.equals(param.getStatus(), Global.NUMERICAL_TWO) || Objects.equals(param.getStatus(), Global.NUMERICAL_THREE)) {
+                //单证审核、已完成
+                wrapper.eq(KwtWaybillOrder::getDriverId, param.getDriverId());
+            }
+
             // 查询这些物流订单对应的运单
-            List<KwtWaybillOrder> waybillsByLogOrder = waybillOrderRepository
-                    .queryWaybillOrderByLogOrderIds(matchedLogOrderIds, param.getEntId(), param.getTruckNo());
+            List<KwtWaybillOrder> waybillsByLogOrder = waybillOrderRepository.list(wrapper);
 
             waybillOrderIds.addAll(waybillsByLogOrder.stream()
                     .map(KwtWaybillOrder::getId)
@@ -626,9 +646,20 @@ public class WaybillOrderService {
                     .map(KwtLogisticsOrderUnit::getLOrderId)
                     .collect(Collectors.toList());
 
+            LambdaQueryWrapper<KwtWaybillOrder> wrapper = Wrappers.<KwtWaybillOrder>lambdaQuery()
+                    .in(KwtWaybillOrder::getLOrderId, matchedLogOrderIds)
+                    .eq(KwtWaybillOrder::getEntId, param.getEntId())
+                    .eq(KwtWaybillOrder::getDelFlag, 0);
+            if (Objects.equals(param.getStatus(), Global.NUMERICAL_ONE)) {
+                //进行中
+                wrapper.eq(KwtWaybillOrder::getTruckNo, param.getTruckNo());
+            } else if (Objects.equals(param.getStatus(), Global.NUMERICAL_TWO) || Objects.equals(param.getStatus(), Global.NUMERICAL_THREE)) {
+                //单证审核、已完成
+                wrapper.eq(KwtWaybillOrder::getDriverId, param.getDriverId());
+            }
+
             // 查询这些物流订单对应的运单
-            List<KwtWaybillOrder> waybillsByUnits =  waybillOrderRepository
-                    .queryWaybillOrderByLogOrderIds(matchedLogOrderIds, param.getEntId(), param.getTruckNo());
+            List<KwtWaybillOrder> waybillsByUnits =  waybillOrderRepository.list(wrapper);
 
             waybillOrderIds.addAll(waybillsByUnits.stream()
                     .map(KwtWaybillOrder::getId)
@@ -650,9 +681,20 @@ public class WaybillOrderService {
                     .map(KwtLogisticsOrderGoods::getLOrderId)
                     .collect(Collectors.toList());
 
+            LambdaQueryWrapper<KwtWaybillOrder> wrapper = Wrappers.<KwtWaybillOrder>lambdaQuery()
+                    .in(KwtWaybillOrder::getLOrderId, matchedLogOrderIds)
+                    .eq(KwtWaybillOrder::getEntId, param.getEntId())
+                    .eq(KwtWaybillOrder::getDelFlag, 0);
+            if (Objects.equals(param.getStatus(), Global.NUMERICAL_ONE)) {
+                //进行中
+                wrapper.eq(KwtWaybillOrder::getTruckNo, param.getTruckNo());
+            } else if (Objects.equals(param.getStatus(), Global.NUMERICAL_TWO) || Objects.equals(param.getStatus(), Global.NUMERICAL_THREE)) {
+                //单证审核、已完成
+                wrapper.eq(KwtWaybillOrder::getDriverId, param.getDriverId());
+            }
+
             // 查询这些物流订单对应的运单
-            List<KwtWaybillOrder> waybillsByGoods = waybillOrderRepository
-                    .queryWaybillOrderByLogOrderIds(matchedLogOrderIds, param.getEntId(), param.getTruckNo());
+            List<KwtWaybillOrder> waybillsByGoods = waybillOrderRepository.list(wrapper);
 
             waybillOrderIds.addAll(waybillsByGoods.stream()
                     .map(KwtWaybillOrder::getId)