vip定制课

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -1036,7 +1036,14 @@
                cg.subject_id_ subjectId,
                cg.complete_course_num_ completeCourseNum,cg.course_num_ courseNum,
                cg.id_ courseGroupId,cg.course_plan_ coursePlan
-        from course_group cg
+        from (select * from (
+        select cg.name_,cg.subject_id_,cg.complete_course_num_,cg.course_num_,
+        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
         <where>
             <if test="param.teacherId != null">
                 AND cg.teacher_id_ = #{param.teacherId}
@@ -1067,7 +1074,7 @@
         from (select * from (
         select cg.name_,cg.subject_id_,cg.complete_course_num_,cg.course_num_,
         cg.id_,cg.course_plan_,cg.teacher_id_,cg.type_,
-        CASE WHEN cg.status_ = 'COMPLETE' THEN cg.status_ WHEN cg.status_ = 'NOT_START' THEN 'NOT_START' ELSE 'ING' END as status_
+        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

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -169,7 +169,7 @@
         from (select * from (
         select cg.course_num_,cg.complete_course_num_,cg.course_introduce_,cg.pre_student_num_,
         cg.background_pic_,cg.im_group_id_,cg.name_,cg.subject_id_,cg.teacher_id_,
-        CASE WHEN cg.status_ = 'COMPLETE' THEN cg.status_ WHEN cg.status_ = 'NOT_START' THEN 'NOT_START' ELSE 'ING' END as `status_`,
+        CASE WHEN cg.status_ = 'COMPLETE' THEN cg.status_ WHEN cs.status_ = 'NOT_START' THEN 'NOT_START' ELSE 'ING' END as `status_`,
         cs.type_,cs.course_group_id_,cs.class_date_,cs.start_time_,cs.end_time_,cs.id_,cs.class_num_
         from course_schedule cs
         left join course_group cg on cs.course_group_id_ = cg.id_