|
@@ -2381,8 +2381,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
//获取教学点编号
|
|
|
Map<Integer, String> cooperationOrganNames = MapUtil.convertMybatisMap(cooperationOrganDao.queryNameByIds(StringUtils.join(musicGroupList.stream().map(MusicGroup::getCooperationOrganId).collect(Collectors.toSet()), ",")));
|
|
|
|
|
|
-// Set<Integer> organIds = musicGroupList.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
|
|
|
-// Map<Integer,String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMap(StringUtils.join(organIds,",")));
|
|
|
+ Set<Integer> organIds = musicGroupList.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
|
|
|
+ Map<Integer,String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMap(StringUtils.join(organIds,",")));
|
|
|
|
|
|
List<MusicGroupPurchaseList> musicGroupPurchaseListCount = musicGroupPurchaseListDao.getCount(musicGroupIds);
|
|
|
Map<String, Integer> purchaseListMap = musicGroupPurchaseListCount.stream().collect(Collectors.toMap(MusicGroupPurchaseList::getMusicGroupId, MusicGroupPurchaseList::getPurchaseNum));
|
|
@@ -2391,7 +2391,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
//获取分部名称map
|
|
|
musicGroupList.forEach(e -> {
|
|
|
// e.setSchoolName(schoolNameMap.get(e.getSchoolId()));
|
|
|
-// e.setOrganName(organNames.get(e.getOrganId()));
|
|
|
+ e.setOrganName(organNames.get(e.getOrganId()));
|
|
|
e.setCooperationOrganName(cooperationOrganNames.get(e.getCooperationOrganId()));
|
|
|
e.setEducationalTeacherName(educationalTeacherNameMap.get(e.getEducationalTeacherId()));
|
|
|
e.setTeamTeacherName(teamTeacherNameMap.get(e.getTeamTeacherId()));
|