fix:运力实时调度列表查询bug

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

@@ -84,6 +84,7 @@ public class WorkOrderManageController {
                                                      @RequestHeader(value = "userId") Long userId,
                                                      @RequestBody WorkManagePageParam param) {
         log.info("获取运力调度统计汇总信息，调用/tms/work_order_manage/statistics orgId:{} ", orgId);
+        param.setOrgId(orgId);
         return new Result<>(workOrderService.getTruckOrderStatistics(param));
     }
 

src/main/resources/mapper/TruckMapper.xml

@@ -144,7 +144,7 @@
                 tbl.queueNo is null, tbl.queueNo asc
             </when>
             <when test="param != null and param.sortBy != null">
-                #{sortBy} #{sortType}
+                #{param.sortBy} #{param.sortType}
             </when>
             <otherwise>
                 tbl.createDate desc
@@ -195,7 +195,7 @@
     <select id="getTotalCount" parameterType="com.aoyang.tms.controller.param.WorkManagePageParam" resultType="java.lang.Integer">
         SELECT count(1)
         FROM (
-            select truck_id FROM  truck
+            select truck.truck_id FROM  truck
             left join (
             select * from tms_work_order wo where 40 > wo.order_status
             order by order_status desc, plan_reach_time asc
@@ -217,7 +217,7 @@
     <!-- 查询未执行派单车辆 -->
     <select id="getUnExecutedOrderTruckCount" parameterType="com.aoyang.tms.controller.param.WorkManagePageParam" resultType="java.lang.Integer">
         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
+        FROM ( select truck.truck_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 = #{param.orgId} and wo.id is not null
         <if test="param!=null and param.deptId!=null">
             and truck.dept_id = #{param.deptId}
@@ -250,7 +250,8 @@
 
     <!-- 查询未派指定类型运单车车辆 -->
     <select id="getUnAllocatedOrderCount" parameterType="com.aoyang.tms.controller.param.WorkManagePageParam" resultType="java.lang.Integer">
-        SELECT count(1)
+        SELECT count(1) FROM (
+        SELECT truck.truck_id
         FROM
         truck
         left join tms_work_order wo on truck.truck_id = wo.truck_id and 40 > wo.order_status
@@ -277,6 +278,7 @@
         <if test="param!=null and param.carNumber!=null and param.carNumber!='' ">
             and truck.car_number = #{param.carNumber}
         </if>
+        ) tbl
     </select>
 
 </mapper>