|
@@ -85,6 +85,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
private CourseScheduleDao courseScheduleDao;
|
|
|
|
|
|
@Autowired
|
|
|
+ private OrganizationDao organizationDao;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
|
|
|
|
|
|
@Autowired
|
|
@@ -539,12 +542,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
// 获取教务老师编号列表
|
|
|
Set<Integer> educationalTeacherIds = musicGroupList.stream().map(e -> e.getEducationalTeacherId()).collect(Collectors.toSet());
|
|
|
// 获取相关老师的名字
|
|
|
- List<Map<Integer, String>> educationalTeacherNames = teacherDao.queryNameByIds(educationalTeacherIds);
|
|
|
+ List<Map<Integer, String>> educationalTeacherNames = teacherDao.queryNameByIds(StringUtils.join(educationalTeacherIds,","));
|
|
|
Map<Integer, String> educationalTeacherNameMap = MapUtil.convertMybatisMap(educationalTeacherNames);
|
|
|
|
|
|
// 获取运营主管编号列表
|
|
|
Set<Integer> teamTeacherIds = musicGroupList.stream().map(e -> e.getTeamTeacherId()).collect(Collectors.toSet());
|
|
|
- List<Map<Integer, String>> teamTeacherNames = teacherDao.queryNameByIds(teamTeacherIds);
|
|
|
+ List<Map<Integer, String>> teamTeacherNames = teacherDao.queryNameByIds(StringUtils.join(teamTeacherIds,","));
|
|
|
Map<Integer, String> teamTeacherNameMap = MapUtil.convertMybatisMap(teamTeacherNames);
|
|
|
|
|
|
// 获取乐团编号列表
|
|
@@ -618,7 +621,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
// 删除乐团付费主体列表
|
|
|
musicGroupPaymentEntitiesDao.delByGroupId(musicGroupId);
|
|
|
//批量新增
|
|
|
- if(subFeeSettingDto.getMusicGroupPaymentEntities() != null){
|
|
|
+ if(subFeeSettingDto.getMusicGroupPaymentEntities() != null && subFeeSettingDto.getMusicGroupPaymentEntities().size() > 0){
|
|
|
musicGroupPaymentEntitiesDao.batchAdd(subFeeSettingDto.getMusicGroupPaymentEntities(),musicGroupId);
|
|
|
}
|
|
|
}
|
|
@@ -652,7 +655,27 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
|
|
|
musicGroup.setStatus(MusicGroupStatusEnum.PAY);
|
|
|
musicGroupDao.update(musicGroup);
|
|
|
+ return musicGroup;
|
|
|
+ }
|
|
|
|
|
|
+ @Override
|
|
|
+ public MusicGroup getMusicGroupDetail(String musicGroupId) {
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
|
|
|
+ musicGroup.setEducationalTeacherName(teacherDao.queryNameById(musicGroup.getEducationalTeacherId()));
|
|
|
+ musicGroup.setTeamTeacherName(teacherDao.queryNameById(musicGroup.getTeamTeacherId()));
|
|
|
+ Organization organization = organizationDao.get(musicGroup.getOrganId());
|
|
|
+ if(organization != null){
|
|
|
+ musicGroup.setOrganName(organization.getName());
|
|
|
+ }
|
|
|
+ School school = schoolDao.get(musicGroup.getSchoolId());
|
|
|
+ if(school != null){
|
|
|
+ musicGroup.setSchoolName(school.getName());
|
|
|
+ musicGroup.setAddress(school.getAddress());
|
|
|
+ }
|
|
|
+ ChargeType chargeType = chargeTypeDao.get(musicGroup.getChargeTypeId());
|
|
|
+ if(chargeType != null){
|
|
|
+ musicGroup.setChargeTypeName(chargeType.getName());
|
|
|
+ }
|
|
|
return musicGroup;
|
|
|
}
|
|
|
}
|