|
|
|
@ -142,7 +142,7 @@ |
|
|
|
and a.batch_no = #{batchNo} |
|
|
|
and a.batch_no = #{batchNo} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="receiveTime !=null and receiveTime != ''"> |
|
|
|
<if test="receiveTime !=null and receiveTime != ''"> |
|
|
|
and g.receive_time = #{receiveTime} |
|
|
|
and to_char(g.receive_time,'YYYY-MM-DD') = #{receiveTime} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="planStatusList !=null"> |
|
|
|
<if test="planStatusList !=null"> |
|
|
|
and b.status IN |
|
|
|
and b.status IN |
|
|
|
@ -248,7 +248,7 @@ |
|
|
|
and a.batch_no = #{batchNo} |
|
|
|
and a.batch_no = #{batchNo} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="receiveTime !=null and receiveTime != ''"> |
|
|
|
<if test="receiveTime !=null and receiveTime != ''"> |
|
|
|
and b.receive_time = #{receiveTime} |
|
|
|
AND to_char(b.receive_time,'YYYY-MM-DD') = #{receiveTime} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="planStatus !=null and planStatus != ''"> |
|
|
|
<if test="planStatus !=null and planStatus != ''"> |
|
|
|
and h.status = #{planStatus} |
|
|
|
and h.status = #{planStatus} |
|
|
|
|