|
|
@ -182,7 +182,7 @@ |
|
|
|
AND actInfo.ID = #{actId} |
|
|
|
</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> |
|
|
|
) temp |
|
|
|
ORDER BY temp.actCurrentState ASC,temp.CREATED_TIME desc |
|
|
|