|  | @@ -322,7 +322,10 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      <select id="pageStudentSubTotalCourseTimes" resultMap="StudentSubTotalCourseTimesDto"
 | 
	
		
			
				|  |  |              parameterType="map">
 | 
	
		
			
				|  |  | -        SELECT mgpscd.user_id_,su.username_,su.phone_
 | 
	
		
			
				|  |  | +        SELECT
 | 
	
		
			
				|  |  | +               mgpscd.user_id_,su.username_,su.phone_,
 | 
	
		
			
				|  |  | +               mgpscd.course_type_ 'key',
 | 
	
		
			
				|  |  | +               SUM(CASE WHEN mgpscd.used_course_minutes_ = 0 THEN mgpscd.total_course_minutes_ ELSE 0 END) 'value'
 | 
	
		
			
				|  |  |          FROM music_group_payment_student_course_detail mgpscd
 | 
	
		
			
				|  |  |          LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
 | 
	
		
			
				|  |  |          LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
 | 
	
	
		
			
				|  | @@ -334,7 +337,7 @@
 | 
	
		
			
				|  |  |              GROUP BY user_id_
 | 
	
		
			
				|  |  |          ) v on mgpscd.user_id_ = v.user_id_
 | 
	
		
			
				|  |  |          <include refid="sqlStudentSubTotalCourseTimes"/>
 | 
	
		
			
				|  |  | -        GROUP BY mgpscd.user_id_
 | 
	
		
			
				|  |  | +        GROUP BY mgpscd.user_id_,mgpscd.course_type_
 | 
	
		
			
				|  |  |          <include refid="global.limit"/>
 | 
	
		
			
				|  |  |      </select>
 | 
	
		
			
				|  |  |      <select id="findByCalenderAndUserId" resultMap="MusicGroupPaymentStudentCourseDetail">
 |