|
@@ -2726,7 +2726,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
courseScheduleId, null, null, 0);
|
|
|
CbsMusicSheetWrapper.MusicSheetApplicationQuery query = sysMusicScoreService.getMusicSheetApplicationQuery();
|
|
|
query.setRows(1);
|
|
|
- query.setMusicSheetSoundId(musicScoreData.getMusicScoreAccompanimentId().longValue());
|
|
|
+ query.setMusicSheetSoundId(Long.parseLong(musicScoreData.getMusicScoreAccompanimentId()));
|
|
|
List<CbsMusicSheetWrapper.MusicSheetApplication> applications = sysMusicScoreService.queryCbsMusicSheetApplication(query);
|
|
|
if (CollectionUtils.isEmpty(applications)) {
|
|
|
throw new BizException("曲目信息不存在");
|
|
@@ -2737,7 +2737,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
throw new BizException("曲目原音信息不存在");
|
|
|
}
|
|
|
CbsMusicSheetWrapper.MusicSheetSound sheetSound = soundList.stream().
|
|
|
- filter(e -> e.getId().equals(musicScoreData.getMusicScoreAccompanimentId().longValue())).collect(Collectors.toList()).get(0);
|
|
|
+ filter(e -> e.getId().toString().equals(musicScoreData.getMusicScoreAccompanimentId())).collect(Collectors.toList()).get(0);
|
|
|
if (scheduleStudentMusicScores.size() == 0) {
|
|
|
//第一次下载,生成数据
|
|
|
List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseScheduleId);
|
|
@@ -2838,12 +2838,12 @@ public class RoomServiceImpl implements RoomService {
|
|
|
Integer studentId = authUser.getId();
|
|
|
String roomId = musicScoreData.getRoomId();
|
|
|
Long scheduleId = Long.parseLong(roomId.substring(1));
|
|
|
- Integer accompanimentId = musicScoreData.getMusicScoreAccompanimentId();
|
|
|
+ String accompanimentId = musicScoreData.getMusicScoreAccompanimentId();
|
|
|
List<CourseScheduleStudentMusicScore> studentMusicScores = courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(accompanimentId, scheduleId, studentId, null, null);
|
|
|
if (accompanimentId != null) {
|
|
|
CbsMusicSheetWrapper.MusicSheetApplicationQuery query = sysMusicScoreService.getMusicSheetApplicationQuery();
|
|
|
query.setRows(1);
|
|
|
- query.setMusicSheetSoundId(accompanimentId.longValue());
|
|
|
+ query.setMusicSheetSoundId(Long.parseLong(accompanimentId));
|
|
|
List<CbsMusicSheetWrapper.MusicSheetApplication> applications = sysMusicScoreService.queryCbsMusicSheetApplication(query);
|
|
|
if (CollectionUtils.isEmpty(applications)) {
|
|
|
throw new BizException("曲目信息不存在");
|
|
@@ -2854,13 +2854,13 @@ public class RoomServiceImpl implements RoomService {
|
|
|
throw new BizException("曲目原音信息不存在");
|
|
|
}
|
|
|
CbsMusicSheetWrapper.MusicSheetSound sheetSound = soundList.stream().
|
|
|
- filter(e -> e.getId().equals(musicScoreData.getMusicScoreAccompanimentId().longValue())).collect(Collectors.toList()).get(0);
|
|
|
+ filter(e -> e.getId().toString().equals(musicScoreData.getMusicScoreAccompanimentId())).collect(Collectors.toList()).get(0);
|
|
|
SysMusicScoreAccompaniment accompaniment = sysMusicScoreAccompanimentService.initSysMusicScoreAccompaniment(sheetApplication,sheetSound);
|
|
|
if (accompaniment == null) {
|
|
|
throw new BizException("曲目信息不存在");
|
|
|
}
|
|
|
//修改下载状态
|
|
|
- if (studentMusicScores == null || studentMusicScores.size() == 0) {
|
|
|
+ if (CollectionUtils.isEmpty(studentMusicScores)) {
|
|
|
throw new BizException("学员不存在此下载曲目");
|
|
|
}
|
|
|
CourseScheduleStudentMusicScore studentMusicScore = studentMusicScores.get(0);
|