|  |  | @ -286,7 +286,7 @@ | 
			
		
	
		
			
				
					|  |  |  |             i.ACT_QUOTA actQuota, | 
			
		
	
		
			
				
					|  |  |  |             IFNULL(c.signupNum, 0) signupNum,	-- 已报名人数 | 
			
		
	
		
			
				
					|  |  |  |             case | 
			
		
	
		
			
				
					|  |  |  |             when  i.ACT_STATUS = 'published' | 
			
		
	
		
			
				
					|  |  |  |             when  <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() | 
			
		
	
		
			
				
					|  |  |  |             then | 
			
		
	
		
			
				
					|  |  |  |                 case | 
			
		
	
		
			
				
					|  |  |  |                 when <![CDATA[c.signupNum >= ACT_QUOTA ]]> and i.ACT_QUOTA_CATEGORY = 1 | 
			
		
	
	
		
			
				
					|  |  | @ -304,6 +304,7 @@ | 
			
		
	
		
			
				
					|  |  |  |         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> | 
			
		
	
	
		
			
				
					|  |  | 
 |