vip定制课

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -1572,6 +1572,10 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      */
     public Map<String, String> selectRoomConfig() {
         Map<String, String> sysConfig = new HashMap<>();
+        //提前XX分钟创建/进入VIP课房间时间
+        sysConfig.put("vipStartTime", sysConfigService.findConfigValue(SysConfigConstant.PRE_CREATE_VIP_ROOM_MINUTE));
+        //VIP课结束后，XX分钟关闭房间
+        sysConfig.put("vipEndTime", sysConfigService.findConfigValue(SysConfigConstant.DESTROY_EXPIRED_VIP_ROOM_MINUTE));
         //提前XX分钟创建/进入陪练课房间时间
         sysConfig.put("practiceStartTime", sysConfigService.findConfigValue(SysConfigConstant.PRE_CREATE_PRACTICE_ROOM_MINUTE));
         //陪练课结束后，XX分钟关闭房间
@@ -2637,6 +2641,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         Map<Long, com.yonge.cooleshow.biz.dal.entity.SysUser> userMap = sysUserService.getMapByIds(studentIds);
         List<CourseScheduleWrapper.MyCourseVo> courseVos = Lists.newArrayList();
         CourseGroup courseGroup = courseGroupService.lambdaQuery().eq(CourseGroup::getId, query.getCourseGroupId()).one();
+        Subject subject = subjectService.get(courseGroup.getSubjectId());
         for (CourseSchedule courseSchedule : courseSchedules) {
             CourseScheduleWrapper.MyCourseVo courseVo = new CourseScheduleWrapper.MyCourseVo();
             courseVo.setCourseId(courseSchedule.getId());
@@ -2646,6 +2651,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             courseVo.setStatus(courseSchedule.getStatus());
             courseVo.setCourseGoupId(courseGroup.getId());
             courseVo.setCourseGroupName(courseGroup.getName());
+            courseVo.setSubjectId(courseGroup.getSubjectId());
+            courseVo.setSubjectName(subject.getName());
             if(query.getAttendanceStatus() == null){
                 courseVo.setAttendanceStatus(attendanceList.stream().anyMatch(studentAttendance -> studentAttendance.getCourseScheduleId().equals(courseSchedule.getId())));
             }else {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/course/CourseScheduleWrapper.java

@@ -64,6 +64,12 @@ public class CourseScheduleWrapper {
         @ApiModelProperty(value = "考勤状态 , false:未考勤 true:已考勤")
         private Boolean attendanceStatus;
 
+        @ApiModelProperty(value = "声部编号")
+        private Long subjectId;
+
+        @ApiModelProperty(value = "声部名称")
+        private String subjectName;
+
         @ApiModelProperty(value = "学员列表")
         private List<CourseStudentVo> courseStudentVos;
     }