增加乐团小班列表

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

@@ -326,9 +326,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 if (Objects.isNull(totalClassTimes)) {
                     vipGroup.setMonthAvg(Float.parseFloat("0.0"));
                 } else {
-                    if(overCourses<=0){
+                    if (overCourses <= 0) {
                         vipGroup.setMonthAvg(0);
-                    }else{
+                    } else {
                         BigDecimal overCoursesOfMonth = new BigDecimal(overCourses), allClassTimes = new BigDecimal(totalClassTimes);
 
                         Float monthConsumeRate = overCoursesOfMonth.divide(overCoursesOfMonth, 2, BigDecimal.ROUND_HALF_UP).floatValue();
@@ -397,7 +397,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 //        int count = classGroupDao.countCoursePage(params);
         Integer vipCoursesNum = classGroupDao.countStudentVipCourses(userId);
         Integer coursesNum = classGroupDao.countStudentMusicGroupCourses(userId);
-        int count = vipCoursesNum == null?0:vipCoursesNum + (coursesNum==null?0:coursesNum);
+        int count = vipCoursesNum == null ? 0 : vipCoursesNum + (coursesNum == null ? 0 : coursesNum);
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
@@ -406,13 +406,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             List<CourseListDto> vipCourses = classGroupDao.queryStudentVipCourses(userId);
             //获取vip课的学生列表
             Set<String> vipIds = vipCourses.stream().map(CourseListDto::getMusicGroupId).collect(Collectors.toSet());
-            Map<String,String> vipStuNames = MapUtil.convertMybatisMap(classGroupDao.findVipStuNames(StringUtils.join(vipIds,",")));
+            Map<String, String> vipStuNames = MapUtil.convertMybatisMap(classGroupDao.findVipStuNames(StringUtils.join(vipIds, ",")));
             //获取学员的乐团列表详情
             courseListDtos.addAll(classGroupDao.queryStudentMusicGroupCourses(userId));
             courseListDtos.addAll(vipCourses);
             //获取所有教学点名称列表
             Set<Integer> schoolIds = courseListDtos.stream().map(CourseListDto::getTeacherSchoolId).collect(Collectors.toSet());
-            Map<Integer,String> schoolNames = MapUtil.convertMybatisMap(schoolDao.queryNameByIds(StringUtils.join(schoolIds,",")));
+            Map<Integer, String> schoolNames = MapUtil.convertMybatisMap(schoolDao.queryNameByIds(StringUtils.join(schoolIds, ",")));
 //            courseListDtos = classGroupDao.queryCoursePage(params);
             courseListDtos.forEach(e -> {
                 e.setAddress(schoolNames.get(e.getTeacherSchoolId()));
@@ -451,8 +451,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             Map<String, BigDecimal> musicGroupUserNumMap = MapUtil.convertMybatisMap(musicGroupUserNums);
             MusicGroup musicGroup;
             Set<Integer> teachers;
-            for (ImGroupModel e:imGroupModels) {
-                teachers = e.getName() == null?new HashSet<>():new HashSet(Arrays.asList(e.getName().split(",")));
+            for (ImGroupModel e : imGroupModels) {
+                teachers = e.getName() == null ? new HashSet<>() : new HashSet(Arrays.asList(e.getName().split(",")));
                 musicGroup = musicGroups.stream().filter(mg -> mg.getId().equals(e.getId())).findFirst().get();
                 //获取教学老师id列表
 //                Set<Integer> teachers = musicGroupDao.queryTeacherIds(e.getId());
@@ -1369,6 +1369,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public List<ClassGroup> highClassGroupList(String musicGroupId) {
-       return classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId,ClassGroupTypeEnum.HIGH);
+        List<Subject> subjectList = subjectService.findAll(new HashMap<>());
+        List<ClassGroup> classGroupList = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId, ClassGroupTypeEnum.HIGH);
+        for (ClassGroup classGroup : classGroupList) {
+            for (Subject subject : subjectList) {
+                if (classGroup.getSubjectIdList().equals(subject.getId())) {
+                    classGroup.setSubjectName(subject.getName());
+                }
+            }
+        }
+        return classGroupList;
     }
 }