|
|
@@ -161,13 +161,13 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
|
|
|
List<String> cbsMusicSheetIds = records.stream().map(SysMusicScore::getCbsMusicSheetId).collect(Collectors.toList());
|
|
|
List<CbsMusicSheetWrapper.MusicSheetApplication> applications = this.queryCbsMusicSheetApplication(cbsMusicSheetIds);
|
|
|
if(CollectionUtils.isNotEmpty(applications)){
|
|
|
- List<Integer> categoriesIds = records.stream().map(SysMusicScore::getCbsMusicCategoriesId).distinct().filter(Objects::nonNull).collect(Collectors.toList());
|
|
|
+// List<Integer> categoriesIds = records.stream().map(SysMusicScore::getCbsMusicCategoriesId).distinct().filter(Objects::nonNull).collect(Collectors.toList());
|
|
|
//获取分部列表
|
|
|
// Map<Integer, String> organMap = MapUtil.convertMybatisMap(sysMusicScoreCategoriesDao.queryOrganByIds(categoriesIds));
|
|
|
- Map<Integer, String> map = new HashMap<>();
|
|
|
+ /*Map<Integer, String> map = new HashMap<>();
|
|
|
if(CollectionUtils.isNotEmpty(categoriesIds)){
|
|
|
map = cbsMusicScoreCategoriesService.getCategoriesNameMap(categoriesIds);
|
|
|
- }
|
|
|
+ }*/
|
|
|
Map<Long, CbsMusicSheetWrapper.MusicSheetApplication> musicSheetApplicationMap = applications
|
|
|
.stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, Function.identity()));
|
|
|
|
|
|
@@ -191,7 +191,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
|
|
|
List<Instrument> list = instrumentService.lambdaQuery().list();
|
|
|
Map<Integer, Instrument> instrumentMap = list.stream().collect(Collectors.toMap(Instrument::getSubjectId, o -> o));
|
|
|
for (SysMusicScore record : records) {
|
|
|
- record.setCategoriesName(map.get(record.getCbsMusicCategoriesId()));
|
|
|
+// record.setCategoriesName(map.get(record.getCbsMusicCategoriesId()));
|
|
|
// record.setOrganName(organMap.get(record.getMusicScoreCategoriesId()));
|
|
|
CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = musicSheetApplicationMap.get(Long.parseLong(record.getCbsMusicSheetId()));
|
|
|
if(musicSheetApplication != null){
|
