1、bug fix
This commit is contained in:
@@ -70,34 +70,25 @@
|
||||
)
|
||||
</if>
|
||||
|
||||
<if test="req.beginTime != null and req.beginTime != ''">
|
||||
<![CDATA[
|
||||
and STR_TO_DATE(begin_time,'%Y-%m-%d') >= #{req.beginTime}
|
||||
]]>
|
||||
</if>
|
||||
|
||||
<if test="req.beginSTime != null and req.beginSTime != ''">
|
||||
<![CDATA[
|
||||
and STR_TO_DATE(begin_time,'%Y-%m-%d') >= #{req.beginSTime}
|
||||
and STR_TO_DATE(begin_time,'%Y-%m-%d %H:%i:%s') >= #{req.beginSTime}
|
||||
]]>
|
||||
</if>
|
||||
<if test="req.beginETime != null and req.beginETime != ''">
|
||||
<![CDATA[
|
||||
and STR_TO_DATE(begin_time,'%Y-%m-%d') <= #{req.beginETime}
|
||||
]]>
|
||||
</if>
|
||||
<if test="req.endTime != null and req.endTime != ''">
|
||||
<![CDATA[
|
||||
and STR_TO_DATE(end_time,'%Y-%m-%d') <= #{req.endTime}
|
||||
and STR_TO_DATE(begin_time,'%Y-%m-%d %H:%i:%s') <= #{req.beginETime}
|
||||
]]>
|
||||
</if>
|
||||
<if test="req.endSTime != null and req.endSTime != ''">
|
||||
<![CDATA[
|
||||
and STR_TO_DATE(end_time,'%Y-%m-%d') <= #{req.endSTime}
|
||||
and STR_TO_DATE(end_time,'%Y-%m-%d %H:%i:%s') >= #{req.endSTime}
|
||||
]]>
|
||||
</if>
|
||||
<if test="req.endETime != null and req.endETime != ''">
|
||||
<![CDATA[
|
||||
and STR_TO_DATE(end_time,'%Y-%m-%d') <= #{req.endETime}
|
||||
and STR_TO_DATE(end_time,'%Y-%m-%d %H:%i:%s') <= #{req.endETime}
|
||||
]]>
|
||||
</if>
|
||||
<if test="req.todayTmrTasks != null and req.todayTmrTasks != ''">
|
||||
@@ -106,19 +97,15 @@
|
||||
and STR_TO_DATE(end_time,'%Y-%m-%d') <= DATE_ADD(CURRENT_DATE(), INTERVAL 2 DAY)
|
||||
]]>
|
||||
</if>
|
||||
<if test="req.finishTime != null and req.finishTime != ''">
|
||||
<![CDATA[
|
||||
and STR_TO_DATE(finish_time,'%Y-%m-%d') <= #{req.finishTime}
|
||||
]]>
|
||||
</if>
|
||||
|
||||
<if test="req.finishSTime != null and req.finishSTime != ''">
|
||||
<![CDATA[
|
||||
and STR_TO_DATE(finish_time,'%Y-%m-%d') <= #{req.finishSTime}
|
||||
and STR_TO_DATE(finish_time,'%Y-%m-%d %H:%i:%s') >= #{req.finishSTime}
|
||||
]]>
|
||||
</if>
|
||||
<if test="req.finishETime != null and req.finishETime != ''">
|
||||
<![CDATA[
|
||||
and STR_TO_DATE(finish_time,'%Y-%m-%d') <= #{req.finishETime}
|
||||
and STR_TO_DATE(finish_time,'%Y-%m-%d %H:%i:%s') <= #{req.finishETime}
|
||||
]]>
|
||||
</if>
|
||||
<if test='req.sortOrder != null and req.sortOrder == "0"'>
|
||||
|
||||
Reference in New Issue
Block a user