|
@@ -327,8 +327,8 @@
|
|
|
wo.create_time createTime
|
|
wo.create_time createTime
|
|
|
FROM kwt_waybill_order wo
|
|
FROM kwt_waybill_order wo
|
|
|
LEFT JOIN kwt_logistics_order lo on lo.id = wo.l_order_id
|
|
LEFT JOIN kwt_logistics_order lo on lo.id = wo.l_order_id
|
|
|
- LEFT JOIN kwt_waybill_order_address woa1 on woa1.w_order_id = wo.id and woa1.type = 1
|
|
|
|
|
- LEFT JOIN kwt_waybill_order_address woa2 on woa2.w_order_id = wo.id and woa2.type = 2
|
|
|
|
|
|
|
+ LEFT JOIN kwt_waybill_order_address woa1 on woa1.w_order_id = wo.id and woa1.address_type = 1
|
|
|
|
|
+ LEFT JOIN kwt_waybill_order_address woa2 on woa2.w_order_id = wo.id and woa2.address_type = 2
|
|
|
LEFT JOIN kwt_logistics_order_goods log on log.l_order_id = wo.l_order_id
|
|
LEFT JOIN kwt_logistics_order_goods log on log.l_order_id = wo.l_order_id
|
|
|
where wo.del_flag = 0
|
|
where wo.del_flag = 0
|
|
|
and lo.del_flag = 0
|
|
and lo.del_flag = 0
|
|
@@ -365,8 +365,8 @@
|
|
|
loc.update_time createTime
|
|
loc.update_time createTime
|
|
|
FROM kwt_logistics_order_circulate loc
|
|
FROM kwt_logistics_order_circulate loc
|
|
|
LEFT JOIN kwt_logistics_order lo on lo.id = loc.l_order_id
|
|
LEFT JOIN kwt_logistics_order lo on lo.id = loc.l_order_id
|
|
|
- LEFT JOIN kwt_waybill_order_address woa1 on woa1.w_order_id = lo.id and woa1.type = 1
|
|
|
|
|
- LEFT JOIN kwt_waybill_order_address woa2 on woa2.w_order_id = lo.id and woa2.type = 2
|
|
|
|
|
|
|
+ LEFT JOIN kwt_waybill_order_address woa1 on woa1.w_order_id = lo.id and woa1.address_type = 1
|
|
|
|
|
+ LEFT JOIN kwt_waybill_order_address woa2 on woa2.w_order_id = lo.id and woa2.address_type = 2
|
|
|
LEFT JOIN kwt_logistics_order_goods log on log.l_order_id = loc.l_order_id
|
|
LEFT JOIN kwt_logistics_order_goods log on log.l_order_id = loc.l_order_id
|
|
|
where loc.del_flag = 0
|
|
where loc.del_flag = 0
|
|
|
and lo.del_flag = 0
|
|
and lo.del_flag = 0
|
|
@@ -389,8 +389,8 @@
|
|
|
wo.status, wo.create_time createTime
|
|
wo.status, wo.create_time createTime
|
|
|
FROM kwt_waybill_order wo
|
|
FROM kwt_waybill_order wo
|
|
|
LEFT JOIN kwt_logistics_order lo on lo.id = wo.l_order_id
|
|
LEFT JOIN kwt_logistics_order lo on lo.id = wo.l_order_id
|
|
|
- LEFT JOIN kwt_waybill_order_address woa1 on woa1.w_order_id = wo.id and woa1.type = 1
|
|
|
|
|
- LEFT JOIN kwt_waybill_order_address woa2 on woa2.w_order_id = wo.id and woa2.type = 2
|
|
|
|
|
|
|
+ LEFT JOIN kwt_waybill_order_address woa1 on woa1.w_order_id = wo.id and woa1.address_type = 1
|
|
|
|
|
+ LEFT JOIN kwt_waybill_order_address woa2 on woa2.w_order_id = wo.id and woa2.address_type = 2
|
|
|
LEFT JOIN kwt_logistics_order_goods log on log.l_order_id = wo.l_order_id
|
|
LEFT JOIN kwt_logistics_order_goods log on log.l_order_id = wo.l_order_id
|
|
|
where wo.del_flag = 0 and lo.del_flag = 0
|
|
where wo.del_flag = 0 and lo.del_flag = 0
|
|
|
<if test="driverId != null and driverId != ''">
|
|
<if test="driverId != null and driverId != ''">
|