Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
+4
-4
@@ -690,13 +690,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
and bdo.DOCUMENT_DATE <![CDATA[>=]]> #{documentDateStart}
|
||||
</if>
|
||||
<if test="documentDateEnd != null">
|
||||
and bdo.DOCUMENT_DATE <![CDATA[<=]]> #{documentDateEnd}
|
||||
and bdo.DOCUMENT_DATE <![CDATA[<=]]> #{documentDateEnd} + 1 - 1/86400
|
||||
</if>
|
||||
<if test="pushTimeStart != null">
|
||||
and bdo.PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
|
||||
</if>
|
||||
<if test="pushTimeEnd != null">
|
||||
and bdo.PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd}
|
||||
and bdo.PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd} + 1 - 1/86400
|
||||
</if>
|
||||
<if test="ieType != null ">
|
||||
and bdo.IE_TYPE = #{ieType}
|
||||
@@ -1246,13 +1246,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
and DOCUMENT_DATE <![CDATA[>=]]> #{documentDateStart}
|
||||
</if>
|
||||
<if test="documentDateEnd != null">
|
||||
and DOCUMENT_DATE <![CDATA[<=]]> #{documentDateEnd}
|
||||
and DOCUMENT_DATE <![CDATA[<=]]> #{documentDateEnd} + 1 - 1/86400
|
||||
</if>
|
||||
<if test="pushTimeStart != null">
|
||||
and PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
|
||||
</if>
|
||||
<if test="pushTimeEnd != null">
|
||||
and PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd}
|
||||
and PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd} + 1 - 1/86400
|
||||
</if>
|
||||
<if test="ieType != null ">
|
||||
and IE_TYPE = #{ieType}
|
||||
|
||||
Reference in New Issue
Block a user