|
...
|
...
|
@@ -345,16 +345,14 @@ FROM |
|
|
|
FROM
|
|
|
|
ffm_info a
|
|
|
|
WHERE
|
|
|
|
1 = 1 -- and islast = 'LAST'
|
|
|
|
-- and reportorder = '1'
|
|
|
|
1 = 1
|
|
|
|
AND dealstatus = '1'
|
|
|
|
<if test="flightno != null and flightno!=''">
|
|
|
|
<if test="flightno != null and flightno!=''">
|
|
|
|
and FLIGHTNO = #{flightno,jdbcType=VARCHAR}
|
|
|
|
and FLIGHTNO LIKE #{flightno,jdbcType=VARCHAR}||'%'
|
|
|
|
</if>
|
|
|
|
AND flightdate BETWEEN to_date(#{subTime},'yyyy-MM-dd') and to_date(#{nowTime},'yyyy-MM-dd')
|
|
|
|
) F
|
|
|
|
) F
|
|
|
|
LEFT JOIN ORIGINMANIFESTMASTER O ON O.WAYBILLNOMASTER = F.WAYBILLNOMASTER
|
|
|
|
WHERE rw=1
|
|
|
|
ORDER BY
|
|
|
|
O.WAYBILLNOMASTER,
|
...
|
...
|
|
