浏览代码

Merge remote-tracking branch 'origin/dev_20260131_youshen430' into dev_20260131_youshen430

xucaiqin 2 周之前
父节点
当前提交
a2c9c2a2cd

+ 4 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/ForkliftOrderService.java

@@ -510,13 +510,15 @@ public class ForkliftOrderService {
 
         //1. 统计“待接单”
         long pendingCount = forkliftWaybillOrderRepository.count(Wrappers.<KwtForkliftWaybillOrder>lambdaQuery()
-                .eq(KwtForkliftWaybillOrder::getStatus, 1));
+                .eq(KwtForkliftWaybillOrder::getStatus, 1)
+                .eq(KwtForkliftWaybillOrder::getEntId, param.getEntId()));
         resultList.add(buildStatItem("1", ForkliftStatusEnum.getDesc(1), pendingCount));
 
         //2. 统计“已接单、已装载”
         long acceptedCount = forkliftWaybillOrderRepository.count(
                 Wrappers.<KwtForkliftWaybillOrder>lambdaQuery()
                         .eq(KwtForkliftWaybillOrder::getDriverId, param.getDriverId())
+                        .eq(KwtForkliftWaybillOrder::getEntId, param.getEntId())
                         .eq(KwtForkliftWaybillOrder::getStatus, 5));
         resultList.add(buildStatItem("5", ForkliftStatusEnum.getDesc(5), acceptedCount));
 
@@ -524,6 +526,7 @@ public class ForkliftOrderService {
         long loadedCount = forkliftWaybillOrderRepository.count(
                 Wrappers.<KwtForkliftWaybillOrder>lambdaQuery()
                         .eq(KwtForkliftWaybillOrder::getDriverId, param.getDriverId())
+                        .eq(KwtForkliftWaybillOrder::getEntId, param.getEntId())
                         .eq(KwtForkliftWaybillOrder::getStatus, 10));
         resultList.add(buildStatItem("10", ForkliftStatusEnum.getDesc(10), loadedCount));