Merge branch 'rosewiper'
This commit is contained in:
commit
64bd20f0fb
@ -888,6 +888,16 @@
|
|||||||
THEN DATE_ADD(REQUEST_TIME, INTERVAL -30 MINUTE)
|
THEN DATE_ADD(REQUEST_TIME, INTERVAL -30 MINUTE)
|
||||||
ELSE DATE_ADD(REQUEST_TIME, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQUEST_TIME)) MINUTE)
|
ELSE DATE_ADD(REQUEST_TIME, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQUEST_TIME)) MINUTE)
|
||||||
END
|
END
|
||||||
|
]]> ,
|
||||||
|
SEND_TIME =
|
||||||
|
<![CDATA[
|
||||||
|
CASE
|
||||||
|
WHEN TIMESTAMPDIFF(MINUTE, NOW(), SEND_TIME) < 0
|
||||||
|
THEN SEND_TIME
|
||||||
|
WHEN TIMESTAMPDIFF(MINUTE, NOW(), SEND_TIME) >= 30
|
||||||
|
THEN DATE_ADD(SEND_TIME, INTERVAL -30 MINUTE)
|
||||||
|
ELSE DATE_ADD(SEND_TIME, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), SEND_TIME)) MINUTE)
|
||||||
|
END
|
||||||
]]>
|
]]>
|
||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
<iterate prepend="AND USER_KEY IN" open="(" close=")" conjunction="," property="userDataList">
|
<iterate prepend="AND USER_KEY IN" open="(" close=")" conjunction="," property="userDataList">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user