| 
					
				 | 
			
			
				@@ -1038,12 +1038,12 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                cg.id_ courseGroupId,cg.course_plan_ coursePlan 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         from (select * from ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select cg.name_,cg.subject_id_,cg.complete_course_num_,cg.course_num_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        cg.id_ course_group_id_,cg.course_plan_,cg.teacher_id_,cg.type_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        cg.id_,cg.course_plan_,cg.teacher_id_,cg.type_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         CASE WHEN cg.status_ = 'COMPLETE' THEN cg.status_ WHEN cs.status_ = 'NOT_START' THEN 'NOT_START' ELSE 'ING' END as status_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         from course_schedule cs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         left join course_group cg on cs.course_group_id_ = cg.id_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         order by cs.start_time_) cs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        group by cs.course_group_id_) cg 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        group by cg.id_) cg 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <where> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="param.teacherId != null"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 AND cg.teacher_id_ = #{param.teacherId} 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1073,12 +1073,12 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                cg.id_ courseGroupId,cg.course_plan_ coursePlan,cg.teacher_id_ teacherId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         from (select * from ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select cg.name_,cg.subject_id_,cg.complete_course_num_,cg.course_num_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        cg.id_ course_group_id_,cg.course_plan_,cg.teacher_id_,cg.type_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        cg.id_,cg.course_plan_,cg.teacher_id_,cg.type_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         CASE WHEN cg.status_ = 'COMPLETE' THEN cg.status_ WHEN cs.status_ = 'NOT_START' THEN 'NOT_START' ELSE 'ING' END as status_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         from course_schedule cs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         left join course_group cg on cs.course_group_id_ = cg.id_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         order by cs.start_time_) cs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        group by cs.course_group_id_) cg 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        group by cg.id_) cg 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         LEFT JOIN sys_user su ON cg.teacher_id_ = su.id_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         left join course_schedule_student_payment cssp ON cssp.course_group_id_ = cg.id_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <where> 
			 |