| 
					
				 | 
			
			
				@@ -473,7 +473,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AND cg.group_type_ = #{type} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="musicGroupId!=null"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            AND cs.music_group_id_=#{music_group_id_} AND cs.group_type_='MUSIC' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            AND cs.music_group_id_=#{musicGroupId} AND cs.group_type_='MUSIC' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ORDER BY CONCAT(cs.class_date_,' ',cs.start_class_time_) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -498,6 +498,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     #{group.id} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 </foreach> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="musicGroupId!=null"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                AND cs.music_group_id_=#{musicGroupId} AND cs.group_type_='MUSIC' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |