Merge remote-tracking branch 'origin/feature/0529-live' into feature/0529-live

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1772,7 +1772,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 VipGroup vipGroup = vipGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
 
                 // 返回课程相关信息
-                teacherClassHeadInfo.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class));
+                // teacherClassHeadInfo.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class));
                 // 单节课时
                 teacherClassHeadInfo.setSingleClassMinutes(vipGroup.getSingleClassMinutes());
                 // 直播间配置

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -96,6 +96,7 @@
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="complaint_status_" property="complaintStatus"/>
         <result column="student_id_" property="studentId"/>
+        <result column="live_room_id_" property="liveRoomId" />
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.entity.StudentCourseScheduleRecordDto" id="studentCourseScheduleRecord">
@@ -724,7 +725,8 @@
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_enum_,
         IF(ta.sign_in_status_ IS NULL,0,1) sign_in_status_,
         IF(ta.sign_out_status_ IS NULL,0,1) sign_out_status_,
-        cs.teach_mode_
+        cs.teach_mode_,
+        cs.live_room_id_
         FROM
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_