Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleDto.java

@@ -102,6 +102,9 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty("直播间信息")
     private ImLiveBroadcastRoomDto liveBroadcastRoom;
 
+    @ApiModelProperty("直播客户端")
+    private String os;
+
     public int getEnableAssignHomework() {
         return enableAssignHomework;
     }
@@ -359,4 +362,12 @@ public class CourseScheduleDto extends CourseSchedule {
     public void setLiveBroadcastRoom(ImLiveBroadcastRoomDto liveBroadcastRoom) {
         this.liveBroadcastRoom = liveBroadcastRoom;
     }
+
+    public String getOs() {
+        return os;
+    }
+
+    public void setOs(String os) {
+        this.os = os;
+    }
 }

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

@@ -1125,6 +1125,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 			// 设置直播间配置
 			courseScheduleDto.setLiveBroadcastRoom(liveRoomMap.get(courseScheduleDto.getMusicGroupId()));
+			if (Objects.nonNull(courseScheduleDto.getLiveBroadcastRoom())) {
+				courseScheduleDto.setOs(courseScheduleDto.getLiveBroadcastRoom().getOs());
+			}
         }
         result.put("list", studentCourseSchedulesWithDate);
         return result;
@@ -1337,6 +1340,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 			// 直播课直播间配置
 			courseScheduleDto.setLiveBroadcastRoom(liveRoomMap.get(courseScheduleDto.getMusicGroupId()));
+			if (Objects.nonNull(courseScheduleDto.getLiveBroadcastRoom())) {
+				courseScheduleDto.setOs(courseScheduleDto.getLiveBroadcastRoom().getOs());
+			}
 		}
         return teacherCourseSchedulesWithDate;
     }

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

@@ -735,7 +735,8 @@
         IF(ta.sign_out_status_ IS NULL,0,1) sign_out_status_,
         cs.teach_mode_,
         cs.live_room_id_,
-        cs.group_type_
+        cs.group_type_,
+        cs.music_group_id_
         FROM
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_