Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into feature/1113-vipCourse

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_ course_group_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}
@@ -1064,7 +1071,14 @@
                cg.subject_id_ subjectId,
                cg.complete_course_num_ completeCourseNum,cg.course_num_ courseNum,
                cg.id_ courseGroupId,cg.course_plan_ coursePlan,cg.teacher_id_ teacherId
-        from course_group cg
+        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_,
+        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
         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>

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

@@ -168,7 +168,8 @@
         cs.course_introduce_ as courseIntroduce
         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_,cg.status_,
+        cg.background_pic_,cg.im_group_id_,cg.name_,cg.subject_id_,cg.teacher_id_,
+        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_
@@ -176,9 +177,6 @@
         <if test="param.groupState !=null and param.groupState !=''">
             AND  find_in_set(cg.status_, #{param.groupState})
         </if>
-        <if test="param.status !=null and param.status !=''">
-            AND cg.status_ = #{param.status}
-        </if>
         <if test="param.subjectId != null and param.subjectId !=''">
             AND cg.subject_id_ = #{param.subjectId}
         </if>
@@ -190,6 +188,9 @@
             <if test="param.search != null and param.search !=''">
                 AND (cs.name_ LIKE CONCAT('%', #{param.search}, '%') OR su.username_ LIKE CONCAT('%', #{param.search}, '%'))
             </if>
+            <if test="param.status !=null and param.status !=''">
+                AND cs.status_ = #{param.status}
+            </if>
         </where>
     </select>
 
@@ -564,7 +565,7 @@
         cs.type_ AS courseType,
         su.username_ AS realName,
         su.id_ AS userId,
-        CONCAT(g.name_,'-第',cs.class_num_,'课') AS name,
+        g.name_ AS name,
         IFNULL(g.pre_student_num_, 0) AS payCount,
         g.background_pic_ AS cover,
         g.subject_id_ AS subjectId,