Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -654,7 +654,7 @@ public class TransportServiceImpl implements TransportService {
         List<RTruckMonitorVo> trucks = new ArrayList<>();
         params = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
             put("busStatus", Global.NUMERICAL_THREE);
-            put("lOrderIds", StringUtil.join(orderIds, Global.COMMA));
+            put("lOrderIds", orderIds);
         }};
         List<KwtWaybillOrder> waybillOrders = waybillOrderDao.findWaybillOrder(params);
         waybillOrders.forEach(order -> trucks.add(new RTruckMonitorVo(order.getEntId(), order.getTruckNo(), Global.NUMERICAL_ONE)));

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

@@ -653,9 +653,6 @@
         <if test="lOrderId != null and lOrderId != ''">
             and kwo.l_order_id = #{lOrderId, jdbcType=BIGINT}
         </if>
-        <if test="lOrderIds != null and lOrderIds != ''">
-            and kwo.l_order_id in ( #{lOrderIds, jdbcType=VARCHAR} )
-        </if>
         <if test="driverId != null and driverId != ''">
             and kwo.driver_id = #{driverId, jdbcType=BIGINT}
         </if>
@@ -674,6 +671,14 @@
         <if test="busStatus != null and busStatus == 4">
             and kwo.status in (7, 8, 9, 10, 12, 13)
         </if>
+        <choose>
+            <when test="lOrderIds != null and lOrderIds != '' and lOrderIds.size() > 0">
+                and kwo.l_order_id in
+                <foreach collection="lOrderIds" item="lOrderId" open="(" close=")" separator=",">
+                    #{lOrderId,jdbcType=BIGINT}
+                </foreach>
+            </when>
+        </choose>
     </select>
 
     <select id="selectInvalidWaybillOrderCarListGroupByTruckNo" resultType="com.sckw.transport.model.dto.OrderCarDTO">