|
@@ -425,6 +425,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
}
|
|
|
detailVo.setId(musicSheet.getId());
|
|
|
detailVo.setCbsMusicSheetId(musicSheet1.getId());
|
|
|
+ detailVo.setMp3Type(AudioTypeEnum.valueOf(musicSheet1.getIsPlayBeat()&&musicSheet1.getIsUseSystemBeat()?"MP3":"MP3_METRONOME"));
|
|
|
+ detailVo.setIsPlayBeat(musicSheet1.getIsPlayBeat());
|
|
|
detailVo.setAudioType(AudioTypeEnum.valueOf(musicSheet1.getPlayMode().getCode()));
|
|
|
detailVo.setCanEvaluate(musicSheet1.getIsEvaluated() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
|
|
|
detailVo.setShowFingering(musicSheet1.getIsShowFingering() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
|
|
@@ -456,7 +458,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
background.add(accompaniment);
|
|
|
}
|
|
|
//按照sortNumber排序
|
|
|
- background.sort(Comparator.comparing(MusicSheetAccompaniment::getSortNumber));
|
|
|
+// background.sort(Comparator.comparing(MusicSheetAccompaniment::getSortNumber));
|
|
|
detailVo.setBackground(background);
|
|
|
}
|
|
|
}
|