|
|
@@ -82,7 +82,7 @@
|
|
|
LEFT JOIN kwt_waybill_order b on b.id = c.w_order_id
|
|
|
<where>
|
|
|
a.id = c.l_order_id
|
|
|
- AND c.type = #{type}
|
|
|
+ AND b.type = #{type}
|
|
|
AND a.del_flag = 0
|
|
|
AND c.del_flag = 0
|
|
|
<if test="orderStatus != null and orderStatus.size() != 0">
|
|
|
@@ -97,17 +97,17 @@
|
|
|
<if test="driverParam.driverName != null and driverParam.driverName != '' or (driverParam.driverPhone != null and driverParam.driverPhone != '') or (driverParam.truckNo != null and driverParam.truckNo != '')">
|
|
|
<!-- and (-->
|
|
|
<if test="driverParam.driverName != null and driverParam.driverName != ''">
|
|
|
- and c.driver_name like concat('%'
|
|
|
+ and b.driver_name like concat('%'
|
|
|
, #{driverParam.driverName}
|
|
|
, '%')
|
|
|
</if>
|
|
|
<if test="driverParam.driverPhone != null and driverParam.driverPhone != ''">
|
|
|
- and c.driver_phone like concat('%'
|
|
|
+ and b.driver_phone like concat('%'
|
|
|
, #{driverParam.driverPhone}
|
|
|
, '%')
|
|
|
</if>
|
|
|
<if test="driverParam.truckNo != null and driverParam.truckNo != ''">
|
|
|
- and c.truck_no like concat('%'
|
|
|
+ and b.truck_no like concat('%'
|
|
|
, #{driverParam.truckNo}
|
|
|
, '%')
|
|
|
</if>
|
lengfaqiang