|
@@ -163,7 +163,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
|
|
if(CollectionUtils.isNotEmpty(applications)){
|
|
if(CollectionUtils.isNotEmpty(applications)){
|
|
Set<Integer> categoriesIds = records.stream().map(SysMusicScore::getMusicScoreCategoriesId).collect(Collectors.toSet());
|
|
Set<Integer> categoriesIds = records.stream().map(SysMusicScore::getMusicScoreCategoriesId).collect(Collectors.toSet());
|
|
//获取分部列表
|
|
//获取分部列表
|
|
- Map<Integer, String> organMap = MapUtil.convertMybatisMap(sysMusicScoreCategoriesDao.queryOrganByIds(categoriesIds));
|
|
|
|
|
|
+// Map<Integer, String> organMap = MapUtil.convertMybatisMap(sysMusicScoreCategoriesDao.queryOrganByIds(categoriesIds));
|
|
Map<Integer, String> map = new HashMap<>(categoriesIds.size());
|
|
Map<Integer, String> map = new HashMap<>(categoriesIds.size());
|
|
for (Integer categoriesId : categoriesIds) {
|
|
for (Integer categoriesId : categoriesIds) {
|
|
if(null != categoriesId){
|
|
if(null != categoriesId){
|
|
@@ -194,7 +194,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
|
|
Map<Integer, Instrument> instrumentMap = list.stream().collect(Collectors.toMap(Instrument::getSubjectId, o -> o));
|
|
Map<Integer, Instrument> instrumentMap = list.stream().collect(Collectors.toMap(Instrument::getSubjectId, o -> o));
|
|
for (SysMusicScore record : records) {
|
|
for (SysMusicScore record : records) {
|
|
record.setCategoriesName(map.get(record.getMusicScoreCategoriesId()));
|
|
record.setCategoriesName(map.get(record.getMusicScoreCategoriesId()));
|
|
- record.setOrganName(organMap.get(record.getMusicScoreCategoriesId()));
|
|
|
|
|
|
+// record.setOrganName(organMap.get(record.getMusicScoreCategoriesId()));
|
|
CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = musicSheetApplicationMap.get(Long.parseLong(record.getCbsMusicSheetId()));
|
|
CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = musicSheetApplicationMap.get(Long.parseLong(record.getCbsMusicSheetId()));
|
|
if(musicSheetApplication != null){
|
|
if(musicSheetApplication != null){
|
|
this.initMusicSheetVo(record,musicSheetApplication,musicalInstrumentQueryMap,categoriesMap,instrumentMap);
|
|
this.initMusicSheetVo(record,musicSheetApplication,musicalInstrumentQueryMap,categoriesMap,instrumentMap);
|