|
@@ -813,6 +813,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//获取学员的乐团列表详情
|
|
|
List<CourseListDto> musicCourse = classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ","), userId);
|
|
|
|
|
|
+ List<CourseSchedule> musicGroupCourses = new ArrayList<>();
|
|
|
+ if(!CollectionUtils.isEmpty(musicGroupIds)){
|
|
|
+ musicGroupCourses = courseScheduleDao.findCourseByGroupIds(musicGroupIds, MUSIC);
|
|
|
+ }
|
|
|
+ Map<String, Map<TeachModeEnum, Long>> musicGroupTeachModeNumMap = new HashMap<>();
|
|
|
+ if(!CollectionUtils.isEmpty(musicGroupCourses)){
|
|
|
+ musicGroupTeachModeNumMap = musicGroupCourses.stream().collect(Collectors.groupingBy(CourseSchedule::getMusicGroupId, Collectors.groupingBy(CourseSchedule::getTeachMode, Collectors.counting())));
|
|
|
+ }
|
|
|
+
|
|
|
if (!CollectionUtils.isEmpty(typeGroupMap.get(PRACTICE))) {
|
|
|
musicGroupIds = typeGroupMap.get(PRACTICE).stream().map(Group::getId).collect(Collectors.toList());
|
|
|
} else {
|
|
@@ -911,8 +920,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
else if(PracticeGroupType.COME_ON_PACKAGE.equals(practiceGroupTypeMap.get(Long.valueOf(e.getPracticeId()))))
|
|
|
e.setPracticeType(3);
|
|
|
}
|
|
|
- }
|
|
|
- if (ClassGroupTypeEnum.VIP == e.getType()) {
|
|
|
+ }else if (ClassGroupTypeEnum.VIP == e.getType()) {
|
|
|
e.setStudentNames(vipStuNames.get(e.getVipId()));
|
|
|
//1:线上;2:线下;3:线上+线下
|
|
|
if (e.getOnlineClassesNum() > 0 && e.getOffLineClassesNum() <= 0) {
|
|
@@ -924,6 +932,27 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
} else {
|
|
|
e.setClassMode(0);
|
|
|
}
|
|
|
+ }else{
|
|
|
+ Long onlineCourseNum = 0L;
|
|
|
+ Long offlineCourseNum = 0L;
|
|
|
+ if(musicGroupTeachModeNumMap.containsKey(e.getMusicId())){
|
|
|
+ Map<TeachModeEnum, Long> teachModeCourseNumMap = musicGroupTeachModeNumMap.get(e.getMusicId());
|
|
|
+ if(teachModeCourseNumMap.containsKey(TeachModeEnum.ONLINE)){
|
|
|
+ onlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.ONLINE);
|
|
|
+ }
|
|
|
+ if(teachModeCourseNumMap.containsKey(TeachModeEnum.OFFLINE)){
|
|
|
+ offlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.OFFLINE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (onlineCourseNum > 0 && offlineCourseNum <= 0) {
|
|
|
+ e.setClassMode(1);
|
|
|
+ } else if (onlineCourseNum > 0 && offlineCourseNum > 0) {
|
|
|
+ e.setClassMode(3);
|
|
|
+ } else if (onlineCourseNum <= 0 && offlineCourseNum > 0) {
|
|
|
+ e.setClassMode(2);
|
|
|
+ } else {
|
|
|
+ e.setClassMode(0);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
pageInfo.setRows(courseListDtos);
|