|
@@ -62,7 +62,7 @@ public class MusicSheetApplicationExtendController {
|
|
|
if (CollectionUtils.isEmpty(rows)) {
|
|
|
return R.from(PageUtil.pageInfo(info, new ArrayList<>()));
|
|
|
}
|
|
|
- String instrumentIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getMusicalInstrumentIds).filter(StringUtils::isNotEmpty).collect(Collectors.joining(","));
|
|
|
+ /*String instrumentIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getMusicalInstrumentIds).filter(StringUtils::isNotEmpty).collect(Collectors.joining(","));
|
|
|
//获取乐器名称
|
|
|
Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap = new HashMap<>();
|
|
|
if(StringUtils.isNotEmpty(instrumentIds)){
|
|
@@ -70,7 +70,7 @@ public class MusicSheetApplicationExtendController {
|
|
|
sysMusicScoreService.queryMusicalInstrument(Arrays.stream(instrumentIds.split(",")).map(Integer::parseInt).distinct().collect(Collectors.toList()));
|
|
|
musicalInstrumentQueryMap = musicalInstrumentQueryDtos.stream()
|
|
|
.collect(Collectors.toMap(CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto::getId, o -> o, (o1, o2) -> o1));
|
|
|
- }
|
|
|
+ }*/
|
|
|
List<Long> cbsMusicIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getId).collect(Collectors.toList());
|
|
|
List<SysMusicScore> musicSheetList = sysMusicScoreService.getDao().findByCbsId(cbsMusicIds);
|
|
|
Map<String, SysMusicScore> map = musicSheetList.stream().collect(Collectors.toMap(SysMusicScore::getCbsMusicSheetId, o -> o, (o1, o2) -> o1));
|
|
@@ -83,7 +83,7 @@ public class MusicSheetApplicationExtendController {
|
|
|
if (Objects.nonNull(musicSheet)) {
|
|
|
musicSheetApplication.setBizId(musicSheet.getId().toString());
|
|
|
}
|
|
|
- if(StringUtils.isNotEmpty(musicSheetApplication.getMusicalInstrumentIds())){
|
|
|
+ /*if(StringUtils.isNotEmpty(musicSheetApplication.getMusicalInstrumentIds())){
|
|
|
String[] split = musicSheetApplication.getMusicalInstrumentIds().split(",");
|
|
|
for (String s : split) {
|
|
|
StringBuffer sb = new StringBuffer();
|
|
@@ -96,7 +96,7 @@ public class MusicSheetApplicationExtendController {
|
|
|
}
|
|
|
musicSheetApplication.setSubjectNames(sb.toString());
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
musicSheetApplications.add(musicSheetApplication);
|
|
|
}
|
|
|
return R.from(PageUtil.pageInfo(info, musicSheetApplications));
|