|
@@ -258,18 +258,23 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public List<HighClassGroupDto> addHighClassGroup(List<HighClassGroupDto> highClassGroupList) throws Exception {
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(highClassGroupList.get(0).getMusicGroupId());
|
|
|
|
|
|
- Integer schoolId = null;
|
|
|
+ List<ClassGroup> classGroups = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroup.getId(), ClassGroupTypeEnum.HIGH);
|
|
|
+ List<Integer> classGroupIds = classGroups.stream().map(classGroup -> classGroup.getId()).collect(Collectors.toList());
|
|
|
+ //删除基础提高班
|
|
|
+ classGroupDao.batchSoftDelete(classGroupIds);
|
|
|
+ //删除基础提高班课程
|
|
|
+ courseScheduleDao.deleteCourseSchedulesByClassGroupIds(classGroupIds);
|
|
|
+ //删除基础提高老师
|
|
|
+ classGroupTeacherMapperDao.delClassGroupTeacherMapper(classGroupIds);
|
|
|
|
|
|
- for (HighClassGroupDto highClassGroup : highClassGroupList) {
|
|
|
-
|
|
|
- if (schoolId == null) {
|
|
|
- MusicGroup musicGroup = musicGroupDao.get(highClassGroup.getMusicGroupId());
|
|
|
- if (musicGroup != null) {
|
|
|
- schoolId = musicGroup.getSchoolId();
|
|
|
- }
|
|
|
- }
|
|
|
+ for (ClassGroup classGroup : classGroups) {
|
|
|
+ imFeignService.groupDismiss(new ImGroupModel(classGroup.getId().toString(), null, classGroup.getName()));
|
|
|
+ }
|
|
|
|
|
|
+ Integer schoolId = musicGroup.getSchoolId();
|
|
|
+ for (HighClassGroupDto highClassGroup : highClassGroupList) {
|
|
|
//1、插入班级信息
|
|
|
Date date;
|
|
|
date = new Date();
|
|
@@ -486,18 +491,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
List<String> musicGroupIds = courseScheduleDao.queryMusicGroupIds(params);
|
|
|
courseListDtos = new ArrayList<>();
|
|
|
//获取学员所购买的vip课列表详情
|
|
|
- List<CourseListDto> vipCourses = classGroupDao.queryStudentVipCourses(StringUtils.join(musicGroupIds, ","),userId);
|
|
|
+ List<CourseListDto> vipCourses = classGroupDao.queryStudentVipCourses(StringUtils.join(musicGroupIds, ","), userId);
|
|
|
//获取vip课的学生列表
|
|
|
Set<String> vipIds = vipCourses.stream().map(CourseListDto::getMusicGroupId).collect(Collectors.toSet());
|
|
|
Map<String, String> vipStuNames = MapUtil.convertMybatisMap(classGroupDao.findVipStuNames(StringUtils.join(vipIds, ",")));
|
|
|
//获取学员的乐团列表详情
|
|
|
- courseListDtos.addAll(classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ","),userId));
|
|
|
+ courseListDtos.addAll(classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ","), userId));
|
|
|
courseListDtos.addAll(vipCourses);
|
|
|
//检测对应乐团是否已申请退费
|
|
|
List<Map<String, Integer>> isApplyMaps;
|
|
|
- if(musicGroupIds != null && musicGroupIds.size() > 0){
|
|
|
+ if (musicGroupIds != null && musicGroupIds.size() > 0) {
|
|
|
isApplyMaps = studentApplyRefundsDao.checkIsApplyRefund(musicGroupIds, userId);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
isApplyMaps = new ArrayList<>();
|
|
|
}
|
|
|
Map<String, Integer> isApplyMap = MapUtil.convertIntegerMap(isApplyMaps);
|
|
@@ -563,7 +568,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
if (imGroupModels != null && imGroupModels.size() > 0) {
|
|
|
Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
|
|
|
//获取班级老师总数map
|
|
|
- Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ",")))),HashMap.class);
|
|
|
+ Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ",")))), HashMap.class);
|
|
|
imGroupModels.forEach(e -> {
|
|
|
Integer num = numsMap.get(Integer.parseInt(e.getId()));
|
|
|
e.setCount((num == null ? 0 : num) + e.getCount());
|
|
@@ -1536,13 +1541,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
List<CourseScheduleTeacherSalary> currentCourseTeachingTeachers = courseScheduleTeachingTeacherMaps.get(e.getCourseScheduleId().longValue());
|
|
|
if (CollectionUtils.isEmpty(currentCourseTeachingTeachers)) {
|
|
|
currentCourseTeachingTeachers = new ArrayList<>();
|
|
|
- if(currentBishopTeacher != null){
|
|
|
+ if (currentBishopTeacher != null) {
|
|
|
currentCourseTeachingTeachers.add(currentBishopTeacher);
|
|
|
}
|
|
|
e.setTeacherNum(currentCourseTeachingTeachers.size());
|
|
|
e.setTeachingTeachers(currentCourseTeachingTeachers);
|
|
|
} else {
|
|
|
- if(currentBishopTeacher != null){
|
|
|
+ if (currentBishopTeacher != null) {
|
|
|
currentCourseTeachingTeachers.add(currentBishopTeacher);
|
|
|
}
|
|
|
e.setTeachingTeachers(currentCourseTeachingTeachers);
|