|
@@ -546,7 +546,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
sheet.setAccompanimentType(AccompanimentTypeEnum.valueOf(musicSheetApplication.getAudioType().getCode()));
|
|
|
}
|
|
|
sheet.setMusicTagNames(musicSheetApplication.getMusicTagNames());
|
|
|
- sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
|
|
|
+ if(musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT){
|
|
|
+ sheet.setSubjectNames(null);
|
|
|
+ }else {
|
|
|
+ sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
|
|
|
+ }
|
|
|
sheet.setPaymentType(musicSheetApplication.getPaymentType());
|
|
|
sheet.setSortNumber(musicSheetApplication.getSortNo());
|
|
|
if (musicSheetApplication.getTopFlag() != null){
|
|
@@ -825,7 +829,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
}
|
|
|
|
|
|
public void initMusicSheetVo(MusicSheetVo record,CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication){
|
|
|
- record.setSubjectNames(musicSheetApplication.getSubjectNames());
|
|
|
+ if (musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT) {
|
|
|
+ record.setSubjectNames(null);
|
|
|
+ } else {
|
|
|
+ record.setSubjectNames(musicSheetApplication.getSubjectNames());
|
|
|
+ }
|
|
|
record.setCbsMusicSheetId(musicSheetApplication.getId());
|
|
|
record.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
|
|
|
record.setCanEvaluate(musicSheetApplication.getIsEvaluated() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
|
|
@@ -1572,9 +1580,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
if (CollectionUtils.isEmpty(rows)){
|
|
|
throw new BizException("查询曲谱信息失败");
|
|
|
}
|
|
|
- List<Subject> subjects = subjectService.getDao().getByCbsSubjectIds(rows.stream().map(CbsMusicSheetWrapper.MusicSheetApplication::getSubjectIds).
|
|
|
- filter(StringUtils::isNotEmpty).collect(Collectors.joining(",")));
|
|
|
- Map<Long, String> subjectMap = subjects.stream().collect(Collectors.toMap(Subject::getCbsSubjectId, Subject::getName));
|
|
|
+// List<Subject> subjects = subjectService.getDao().getByCbsSubjectIds(rows.stream().map(CbsMusicSheetWrapper.MusicSheetApplication::getSubjectIds).
|
|
|
+// filter(StringUtils::isNotEmpty).collect(Collectors.joining(",")));
|
|
|
+// Map<Long, String> subjectMap = subjects.stream().collect(Collectors.toMap(Subject::getCbsSubjectId, Subject::getName));
|
|
|
|
|
|
Map<Long,CbsMusicSheetWrapper.MusicSheetApplication> musicSheetMap =
|
|
|
rows.stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, Function.identity()));
|
|
@@ -1583,7 +1591,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
if(musicSheetApplication == null){
|
|
|
continue;
|
|
|
}
|
|
|
- if(StringUtils.isNotEmpty(musicSheetApplication.getSubjectIds())){
|
|
|
+ /*if(StringUtils.isNotEmpty(musicSheetApplication.getSubjectIds())){
|
|
|
StringBuffer sb = new StringBuffer();
|
|
|
for (String s : musicSheetApplication.getSubjectIds().split(",")) {
|
|
|
String subjectName = subjectMap.get(Long.parseLong(s));
|
|
@@ -1594,7 +1602,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
sb.append(subjectName);
|
|
|
}
|
|
|
}
|
|
|
- record.setSubjectNames(sb.toString());
|
|
|
+ }*/
|
|
|
+ if(musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT){
|
|
|
+ record.setSubjectNames(null);
|
|
|
+ }else {
|
|
|
+ record.setSubjectNames(musicSheetApplication.getSubjectNames());
|
|
|
}
|
|
|
record.setCbsMusicSheetId(musicSheetApplication.getId());
|
|
|
record.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
|