|
@@ -19,10 +19,12 @@
|
|
|
sc.flight_afid,
|
|
|
ap.sort,
|
|
|
aoe.to_department,
|
|
|
- aoe.to_department_id
|
|
|
+ aoe.to_department_id,
|
|
|
+ aoe.department,
|
|
|
+ aoe.department_id
|
|
|
from admin_security_check sc
|
|
|
left join admin_aircraft_position ap on sc.aircraft_position_num = ap.aircraft_position_num
|
|
|
- left join (select a.order_id ,a.to_department,a.to_department_id from admin_order_examine a join (select order_id, MAX(create_time) max_time from admin_order_examine group by order_id) b on a.order_id = b.order_id and a.create_time = b.max_time) aoe on sc.id = aoe.order_id
|
|
|
+ left join (select a.order_id,a.department, a.department_id ,a.to_department,a.to_department_id from admin_order_examine a join (select order_id, MAX(create_time) max_time from admin_order_examine group by order_id) b on a.order_id = b.order_id and a.create_time = b.max_time) aoe on sc.id = aoe.order_id
|
|
|
<where >
|
|
|
<if test="securityCheckListTO.searchContent != null and securityCheckListTO.searchContent != '' and securityCheckListTO.searchContent !='null'">
|
|
|
and (sc.aircraft_num like CONCAT('%',#{securityCheckListTO.searchContent},'%') or
|