|
@@ -80,8 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
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 (date(tv.f_ATD) >= DATE_SUB(CURDATE(), INTERVAL 2 DAY)
|
|
|
+ OR 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>
|
|
@@ -161,8 +161,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
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 (date(tv.f_ATD) >= DATE_SUB(CURDATE(), INTERVAL 2 DAY)
|
|
|
+ OR 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>
|