feat:实时调度列表查询bug

src/main/java/com/aoyang/tms/controller/WorkOrderManageController.java

@@ -32,6 +32,7 @@ import java.net.URLDecoder;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 
 /**
@@ -173,6 +174,7 @@ public class WorkOrderManageController {
                     workOrder.setDriverNameOne(truckDrivers.get(1).getDriverName());
                 }
             }
+            workOrder.setOrderNo(System.currentTimeMillis() - Math.random()*1000 + "");
             workOrder.setCreater(userId);
             workOrder.setCreaterName(userName);
             workOrder.setCreateDate(LocalDateTime.now());
@@ -232,6 +234,7 @@ public class WorkOrderManageController {
                     workOrder.setDriverNameOne(truckDrivers.get(1).getDriverName());
                 }
             }
+            workOrder.setOrderNo(System.currentTimeMillis() - Math.random()*1000 + "");
             workOrder.setCreater(userId);
             workOrder.setCreaterName(userName);
             workOrder.setCreateDate(LocalDateTime.now());
@@ -270,4 +273,11 @@ public class WorkOrderManageController {
 //        return new Result<>(flag);
 //    }
 
+    public static void main(String[] args) {
+        long l = System.currentTimeMillis();
+        for (int i=0;i<10;i++) {
+            System.out.println("@@ " + (l - Math.random()*1000));
+        }
+    }
+
 }

src/main/resources/mapper/TruckMapper.xml

@@ -100,7 +100,7 @@
         order by order_status desc, plan_reach_time asc
         ) two on truck.truck_id = two.truck_id
         left join tms_work_cycle wc on truck.truck_id = wc.truck_id and wc.status = 1
-        where truck.org_id = #{param.orgId}
+        where truck.status = 0 and truck.org_id = #{param.orgId}
             <if test="param!=null and param.deptId!=null">
                 and truck.dept_id = #{param.deptId}
             </if>
@@ -144,11 +144,10 @@
 
     <!-- 查询未执行派单车辆 -->
     <select id="getUnExecutedOrderTruckCount" resultType="java.lang.Integer">
-        SELECT count(DISTINCT truck.truck_id)
-        FROM
-        truck left join tms_work_order wo on truck.truck_id = wo.truck_id and wo.order_status = 0
+        SELECT count(1)
+        FROM ( select id from truck left join tms_work_order wo on truck.truck_id = wo.truck_id and wo.order_status = 0
         WHERE truck.org_id = #{orgId} and truck.tms_status = 0 and wo.id is not null
-        group by truck.truck_id
+        group by truck.truck_id ) tbl
     </select>
 
     <!-- 查询未派单车辆 -->