运单状态修改

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderSubtaskRepository.java

@@ -65,13 +65,15 @@ public class KwtWaybillOrderSubtaskRepository extends ServiceImpl<KwtWaybillOrde
     }
 
     public IPage<KwtWaybillOrderSubtask> queryByPage( Set<Long> logOrderIds, Set<Long> billOrderIds,
-                                                     List<Integer> status,
+                                                     Integer status,
+                                                      List<Integer> waybillOrderStatus,
                                                      int pageNum,
                                                      int pageSize) {
         return page(new Page<>(pageNum, pageSize),
                 Wrappers.<KwtWaybillOrderSubtask>lambdaQuery()
                         .eq(BaseModel::getDelFlag,0)
-                        .in(CollectionUtils.isNotEmpty( status),KwtWaybillOrderSubtask::getStatus, status)
+                        .eq(Objects.nonNull( status),KwtWaybillOrderSubtask::getStatus, status)
+                        .in(CollectionUtils.isNotEmpty( waybillOrderStatus),KwtWaybillOrderSubtask::getStatus, waybillOrderStatus)
                         .in(CollectionUtils.isNotEmpty(logOrderIds),KwtWaybillOrderSubtask::getLOrderId, logOrderIds)
                         .in(CollectionUtils.isNotEmpty(billOrderIds),KwtWaybillOrderSubtask::getWOrderId, billOrderIds)
                         .orderByDesc(BaseModel::getUpdateTime)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -3052,11 +3052,8 @@ public class KwtWaybillOrderV1Service {
         log.info("开始分页查询子运单信息，物流订单ID数量: {}, 运单ID数量: {}, 状态: {}", 
                 logOrderIds.size(), billOrderIds.size(), status);
         List<Integer> waybillOrderStatus = getWaybillOrderStatus();
-        if (Objects.nonNull( status)){
-            waybillOrderStatus = List.of(status);
-        }
         IPage<KwtWaybillOrderSubtask> page = waybillOrderSubtaskRepository.queryByPage(
-                logOrderIds, billOrderIds, waybillOrderStatus, req.getPageNum(), req.getPageSize());
+                logOrderIds, billOrderIds, status,waybillOrderStatus, req.getPageNum(), req.getPageSize());
 
         List<KwtWaybillOrderSubtask> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {