|
@@ -169,8 +169,7 @@
|
|
|
LEFT JOIN sys_user su ON tv.f_manageid = su.user_id
|
|
|
<where>
|
|
|
tv.f_status = 'T'
|
|
|
- AND (date(tv.f_ATD) >= DATE_SUB(CURDATE(), INTERVAL 2 DAY)
|
|
|
- OR tv.f_ATD IS NULL)
|
|
|
+ AND tv.f_ATD IS NULL
|
|
|
<if test="fId != null ">and tv.f_id = #{fId}</if>
|
|
|
<if test="fPid != null ">and tv.f_pid = #{fPid}</if>
|
|
|
<if test="fNo != null and fNo != ''">and tv.f_no = #{fNo}</if>
|
|
@@ -257,8 +256,7 @@
|
|
|
LEFT JOIN sys_user su ON tv.f_manageid = su.user_id
|
|
|
<where>
|
|
|
tv.f_status = 'T'
|
|
|
- AND (date(tv.f_ATD) >= DATE_SUB(CURDATE(), INTERVAL 2 DAY)
|
|
|
- OR tv.f_ATD IS NULL)
|
|
|
+ AND tv.f_ATD IS NULL
|
|
|
<if test="fPid != null ">and tv.f_pid = #{fPid}</if>
|
|
|
<if test="fNo != null and fNo != ''">and tv.f_no = #{fNo}</if>
|
|
|
<if test="fPortofloadid != null ">and tv.f_portofloadid = #{fPortofloadid}</if>
|
|
@@ -495,8 +493,7 @@
|
|
|
t_voyage tv
|
|
|
<where>
|
|
|
tv.f_status = 'T'
|
|
|
- AND (date(tv.f_ATD) >= DATE_SUB(CURDATE(), INTERVAL 2 DAY)
|
|
|
- OR tv.f_ATD IS NULL)
|
|
|
+ AND tv.f_ATD IS NULL
|
|
|
<if test="fPortofloadid != null ">and tv.f_portofloadid = #{fPortofloadid}</if>
|
|
|
<if test="fDistinationid != null ">and tv.f_distinationid = #{fDistinationid}</if>
|
|
|
<if test="fPortoftransshipment != null ">and tv.f_portoftransshipment = #{fPortoftransshipment}</if>
|
|
@@ -566,8 +563,7 @@
|
|
|
ON tv.f_id = tc.pId
|
|
|
<where>
|
|
|
tv.f_status = 'T'
|
|
|
- AND (date(tv.f_ATD) >= DATE_SUB(CURDATE(), INTERVAL 2 DAY)
|
|
|
- OR tv.f_ATD IS NULL)
|
|
|
+ AND tv.f_ATD IS NULL
|
|
|
AND tv.f_id = #{fId}
|
|
|
</where>
|
|
|
</select>
|