| 
					
				 | 
			
			
				@@ -408,7 +408,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="isActive" column="isActive_"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </resultMap> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="queryMusicGroupStudent" resultMap="MusicGroupStudentsDto"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        SELECT sr.user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,sr.current_grade_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        SELECT sr.user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,sr.current_grade_,sr.payment_status_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         sr.current_class_,sr.music_group_status_,mgsf.next_payment_date_,mgsf.course_fee_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         s.name_ subject_name_,sr.music_group_id_,case when su.password_ is null then 0 else 1 end isActive_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         IF(DATE_FORMAT(sr.create_time_,'%Y-%m-%d') > DATE_FORMAT(mg.payment_expire_date_,'%Y-%m-%d'),1,0) is_new_student_ 
			 |