| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -160,6 +160,7 @@ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    <resultMap id="newEventsMap" type="com.epmet.dto.result.NewEventsResultDTO"> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        <result property="eventContent" column="eventContent"/> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        <result property="eventTime" column="eventTime"/> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        <result property="eventId" column="eventId"/> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        <collection property="eventImgs" ofType="java.lang.String"> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            <result column="img"/> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        </collection> | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -168,7 +169,8 @@ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        SELECT | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        IFNULL(re.EVENT_CONTENT,'') AS eventContent, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        IFNULL(ea.ATTACHMENT_URL,'') AS img | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        IFNULL(ea.ATTACHMENT_URL,'') AS img, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        re.id as eventId | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        FROM resi_event_report_org ro | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0') | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |