|
|
@ -303,7 +303,6 @@ |
|
|
|
and <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() |
|
|
|
then 'end_sign_up' |
|
|
|
when <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW() |
|
|
|
and <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() |
|
|
|
then 'in_progress' |
|
|
|
end as actCurrentState |
|
|
|
FROM act_info i |
|
|
@ -311,7 +310,6 @@ |
|
|
|
WHERE i.DEL_FLAG = '0' |
|
|
|
AND i.CUSTOMER_ID = #{customerId} |
|
|
|
AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled' |
|
|
|
AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() |
|
|
|
ORDER BY i.CREATED_TIME DESC |
|
|
|
LIMIT 0, #{num} |
|
|
|
</select> |
|
|
|