1、车辆运单bug修复；

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

@@ -2151,7 +2151,7 @@ public class KwtWaybillOrderService {
         //商品信息
         KwtLogisticsOrderGoods goods = logisticsOrderGoodsDao.findByGoods(waybillOrder.getLOrderId());
         //审批意见
-        KwtWaybillOrderTrack track = waybillOrderTrackDao.findWaybillOrderTrack(waybillOrder.getLOrderId(), CarWaybillEnum.APPROVAL_NO_PASS.getCode());
+        KwtWaybillOrderTrack track = waybillOrderTrackDao.findWaybillOrderTrack(waybillOrder.getId(), CarWaybillEnum.APPROVAL_NO_PASS.getCode());
 
         //用户数据集
         List<Long> createBys = new ArrayList() {{
@@ -2295,7 +2295,8 @@ public class KwtWaybillOrderService {
         }
         //已卸货/审批不通过车辆运单才能审核
         if (waybillOrder.getStatus() != CarWaybillEnum.COMPLETION_UNLOADING.getCode()
-                && waybillOrder.getStatus() != CarWaybillEnum.APPROVAL_NO_PASS.getCode()) {
+                && waybillOrder.getStatus() != CarWaybillEnum.APPROVAL_NO_PASS.getCode()
+                && waybillOrder.getStatus() != CarWaybillEnum.APPROVAL_IN.getCode()) {
             return HttpResult.error("车辆运单当前状态已不能审核！");
         }
         //已卸货/审批不通过车辆运单只能审批通过或审批不通过

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

@@ -343,7 +343,6 @@
         ) tab1
     </select>
 
-
     <select id="findWaitWaybillOrderByDriver" resultType="com.sckw.transport.model.vo.WaybillOrderDriverVo"
             parameterType="java.util.Map">
         SELECT *
@@ -424,8 +423,9 @@
                 and lo.del_flag = 0
                 and loc.status = 0
                 and loc.w_order_id is null
-                and loc.driver_id = #{driverId, jdbcType=BIGINT}) tab
-        order by createTime desc
+                and loc.driver_id = #{driverId, jdbcType=BIGINT}
+        ) tab
+        order by startTime
     </select>
 
     <select id="findOtherWaybillOrderByDriver" resultType="com.sckw.transport.model.vo.WaybillOrderDriverVo"
@@ -466,6 +466,13 @@
         <if test="endTime != null and endTime != ''">
             and DATE(wo.create_time) <![CDATA[ <= ]]> #{endTime,jdbcType=TIMESTAMP}
         </if>
+
+        <if test="busStatus != null and busStatus == 2">
+            ORDER BY wo.start_time
+        </if>
+        <if test="busStatus != null and busStatus == 4">
+            ORDER BY wo.create_time desc
+        </if>
     </select>
 
     <select id="selectWaybillOrderCarListNotPage" resultType="com.sckw.transport.model.dto.OrderCarDTO">