feat:实时调度列表查询bug

src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -145,7 +145,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         //剩余运力
         vo.setSurplusCount(vo.getTotal() - vo.getLoadCount() - vo.getUnloadCount());
         //未执行运单
-        vo.setUnExecuted(getOrgOrderCount(orgId, null, WorkOrderEnum.TODO.orderStatus()));
+        vo.setUnExecuted(truckMapper.getUnExecutedOrderTruckCount(orgId));
         //未派单
         vo.setUnAllocated(truckMapper.getUnAllocatedTruckCount(orgId));
         //空车未派装车单

src/main/resources/mapper/TruckMapper.xml

@@ -125,10 +125,10 @@
                 and two.id is not null
             </if>
             <if test="param!=null and param.emptyUnAllocated == 1">
-                and (wc.jing_weight = 0 or wc.jing_weight is null)
+                and (wc.jing_weight = 0 or wc.jing_weight is null) and two.id is null
             </if>
             <if test="param!=null and param.heavyUnAllocated == 1">
-                and wc.jing_weight > 0
+                and wc.jing_weight > 0 and two.id is null
             </if>
         group by truck.truck_id
     </select>