|
|
@ -186,10 +186,10 @@ |
|
|
|
<![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp} |
|
|
|
</if> |
|
|
|
<if test='actType != null and actType != "" and actType == "0"'> |
|
|
|
<![CDATA[ AND DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp} |
|
|
|
<![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp} |
|
|
|
</if> |
|
|
|
<if test='actType != null and actType != "" and actType == "1"'> |
|
|
|
<![CDATA[ AND DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> #{timestamp} |
|
|
|
<![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp} |
|
|
|
</if> |
|
|
|
ORDER BY |
|
|
|
actInfo.CREATED_TIME DESC |
|
|
|