1.承运订单停止接单查询，数据统计bugfix

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -144,7 +144,7 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
      * @param driverParam
      * @return
      */
-    List<DriverListVo> selectDriverCountById(@Param("driverParam") DriverParam driverParam, @Param("type") Integer type);
+    List<DriverListVo> selectDriverCountById(@Param("driverParam") DriverParam driverParam, @Param("type") Integer type, @Param("orderStatus") List<Integer> orderStatus);
 
     /**
      * @param ids

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtAcceptCarriageOrderService.java

@@ -1171,7 +1171,7 @@ public class KwtAcceptCarriageOrderService {
                 }
             }
             //只展示待接单数据统计
-            List<DriverListVo> truckCount = logisticsOrderMapper.selectDriverCountById(driverParam,Integer.valueOf(driverParam.getType()));
+            List<DriverListVo> truckCount = logisticsOrderMapper.selectDriverCountById(driverParam,Integer.valueOf(driverParam.getType()),orderStatus);
             Map<String, Integer> truckMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             truckCount.forEach(entity -> {
                 truckMap.put(entity.getTruckNo(), entity.getCount());

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -751,12 +751,13 @@
 
     <select id="selectDriverCountById" resultType="com.sckw.transport.model.vo.DriverListVo">
         SELECT count(1) AS count,
-        b.truck_no AS truckNo
+        c.truck_no AS truckNo
         FROM
-            kwt_waybill_order b
+        kwt_waybill_order_subtask b
+        LEFT JOIN kwt_waybill_order c on b.w_order_id =c.id
         <where>
             b.del_flag = 0
-            AND b.type =#{type}
+            AND c.type =#{type}
             AND b.status in (501
               , 502
               , 503
@@ -783,7 +784,7 @@
                 </if>
             </if>
             GROUP BY
-                b.truck_no
+                c.truck_no
         </where>
     </select>