Преглед на файлове

feat:实时调度列表查询bug

wangweiyu преди 4 години
родител
ревизия
e53c516965
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

+ 2 - 2
src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -136,7 +136,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         vo.setLoadWait(getOrgOrderCount(orgId, 1, WorkOrderEnum.ZHUANGCHE_WAIT.orderStatus()));
         vo.setLoadGotoSpot(getOrgOrderCount(orgId, 1, WorkOrderEnum.GOTO_ZHUANGCHE_SPOT.orderStatus()));
         vo.setLoadSubmit(getOrgOrderCount(orgId, 1, WorkOrderEnum.ZHUANGCHE_RESULT_SUBMIT.orderStatus()));
-        vo.setLoadCount(vo.getLoadGotoSpot() + vo.getLoadGotoSpot() + vo.getLoadSubmit());
+        vo.setLoadCount(vo.getLoadWait() + vo.getLoadGotoSpot() + vo.getLoadSubmit());
         //卸车
         vo.setUnloadWait(getOrgOrderCount(orgId, 2, WorkOrderEnum.XIECHE_WAIT.orderStatus()));
         vo.setUnloadGotoSpot(getOrgOrderCount(orgId, 2, WorkOrderEnum.GOTO_XIECHE_SPOT.orderStatus()));
@@ -157,7 +157,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
 
     private int getOrgOrderCount(Long orgId, Integer type, Integer status) {
         QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>().eq("org_id", orgId).
-                eq("order_status", status);
+                eq("order_status", status).lt("status", 40);
         if (type != null) {
             queryWrapper.eq("type", type);
         }