|
@@ -382,7 +382,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
}
|
|
|
classGroupTeacherMapper.setTeacherDefaultMusicGroupSalaryList(teacherSalaryByUserIdAndType);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
return classGroupAndTeachers;
|
|
|
}
|
|
@@ -395,12 +394,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
params.put("userId",userId);
|
|
|
List<CourseListDto> courseListDtos = null;
|
|
|
-// 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);
|
|
|
-// if (count > 0) {
|
|
|
-// pageInfo.setTotal(count);
|
|
|
//获取分页前的所有的乐团编号和vip编号
|
|
|
params.put("offset", pageInfo.getOffset());
|
|
|
List<String> musicGroupIds = courseScheduleDao.queryMusicGroupIds(params);
|
|
@@ -416,7 +409,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//获取所有教学点名称列表
|
|
|
Set<Integer> schoolIds = courseListDtos.stream().map(CourseListDto::getTeacherSchoolId).collect(Collectors.toSet());
|
|
|
Map<Integer,String> schoolNames = MapUtil.convertMybatisMap(schoolDao.queryNameByIds(StringUtils.join(schoolIds,",")));
|
|
|
-// courseListDtos = classGroupDao.queryCoursePage(params);
|
|
|
+
|
|
|
courseListDtos.forEach(e -> {
|
|
|
e.setAddress(schoolNames.get(e.getTeacherSchoolId()));
|
|
|
if (ClassGroupTypeEnum.VIP == e.getType()) {
|
|
@@ -433,7 +426,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
}
|
|
|
});
|
|
|
pageInfo.setTotal(courseListDtos.size());
|
|
|
-// }
|
|
|
if (courseListDtos.size() == 0) {
|
|
|
courseListDtos = new ArrayList<>();
|
|
|
}
|