|
@@ -3939,21 +3939,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object teacherCourseHeadInfo(Long courseScheduleId) {
|
|
|
- SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
- if (null == user) {
|
|
|
- throw new BizException("获取用户信息失败");
|
|
|
- }
|
|
|
- CourseSchedule schedule = courseScheduleDao.get(courseScheduleId);
|
|
|
- if(schedule == null){
|
|
|
- throw new BizException("课程不存在");
|
|
|
- }
|
|
|
- GroupType groupType = schedule.getGroupType();
|
|
|
+ public Object getTeacherCourseHeadInfo(GroupType groupType,String groupId){
|
|
|
Map<String,Object> resultMap = new HashMap<>(8);
|
|
|
Teacher teacher;
|
|
|
switch (groupType){
|
|
|
case PRACTICE:
|
|
|
- PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(schedule.getMusicGroupId()));
|
|
|
+ PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(groupId));
|
|
|
resultMap.put("groupName",practiceGroup.getName());
|
|
|
resultMap.put("startTime",practiceGroup.getCoursesStartDate());
|
|
|
resultMap.put("endTime",practiceGroup.getCoursesExpireDate());
|
|
@@ -3966,7 +3957,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
resultMap.put("teacherGiveLesson",courseScheduleTeacherSalaryDao.countTeacherGiveLesson(practiceGroup.getUserId()));
|
|
|
break;
|
|
|
case VIP:
|
|
|
- VipGroup vipGroup = vipGroupDao.get(Long.parseLong(schedule.getMusicGroupId()));
|
|
|
+ VipGroup vipGroup = vipGroupDao.get(Long.parseLong(groupId));
|
|
|
resultMap.put("groupName",vipGroup.getName());
|
|
|
resultMap.put("startTime",vipGroup.getCourseStartDate());
|
|
|
resultMap.put("endTime",vipGroup.getCoursesExpireDate());
|
|
@@ -3985,6 +3976,32 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ public Object queryCourseInfoByGroupId(GroupType groupType, String groupId) {
|
|
|
+ List<CourseSchedule> courseSchedules = courseScheduleDao.findCourseByGroupId(groupType.getCode(),groupId);
|
|
|
+ Map<String,Object> resultMap = new HashMap<>(4);
|
|
|
+ resultMap.put("courseInfo",courseSchedules);
|
|
|
+ resultMap.put("count",courseSchedules.size());
|
|
|
+ int online = courseSchedules.stream().filter(e -> e.getTeachMode() == TeachModeEnum.ONLINE).collect(Collectors.toList()).size();
|
|
|
+ int offline = courseSchedules.stream().filter(e -> e.getTeachMode() == TeachModeEnum.OFFLINE).collect(Collectors.toList()).size();
|
|
|
+ resultMap.put("online",online);
|
|
|
+ resultMap.put("offline",offline);
|
|
|
+ return resultMap;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Object teacherCourseHeadInfo(Long courseScheduleId) {
|
|
|
+ SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
+ if (null == user) {
|
|
|
+ throw new BizException("获取用户信息失败");
|
|
|
+ }
|
|
|
+ CourseSchedule schedule = courseScheduleDao.get(courseScheduleId);
|
|
|
+ if(schedule == null){
|
|
|
+ throw new BizException("课程不存在");
|
|
|
+ }
|
|
|
+ return getTeacherCourseHeadInfo(schedule.getGroupType(),schedule.getMusicGroupId());
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
public Object teacherCourseRates(Long courseScheduleId) {
|
|
|
SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
if (null == user) {
|