|
@@ -113,7 +113,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
|
|
|
return page.setRecords(musicSheets);
|
|
|
}
|
|
|
CbsMusicSheetWrapper.MusicSheetApplicationQuery cbsQuery = musicSheetService.getMusicSheetApplicationQuery();
|
|
|
- List<Long> cbsMusicSheetIds = musicSheets.stream().map(e -> e.getCbsMusicSheetId()).collect(Collectors.toList());
|
|
|
+ List<Long> cbsMusicSheetIds = musicSheets.stream().map(TenantAlbumMusicWrapper.StudentTenantAlbumMusic::getCbsMusicSheetId).collect(Collectors.toList());
|
|
|
cbsQuery.setMusicSheetIds(cbsMusicSheetIds);
|
|
|
cbsQuery.setRows(cbsMusicSheetIds.size());
|
|
|
List<CbsMusicSheetWrapper.MusicSheetApplication> rows = musicSheetService.queryCbsMusicSheetApplication(cbsQuery);
|
|
@@ -199,7 +199,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
|
|
|
studentTenantAlbumMusic.setTitleImg(row.getCoverImg());
|
|
|
studentTenantAlbumMusic.setMusicSubject(row.getCourseTypeCode());
|
|
|
studentTenantAlbumMusic.setMusicSubjectName(ECourseType.valueOf(row.getCourseTypeCode()).getName());
|
|
|
- musicSheets.add(studentTenantAlbumMusic);
|
|
|
+ musicSheets.add(studentTenantAlbumMusic.courseNum(row.getCourseNum()).unitTestNum(row.getUnitTestNum()));
|
|
|
|
|
|
}
|
|
|
|
|
@@ -414,7 +414,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
|
|
|
} else {
|
|
|
List<Long> useAlbumIdsByUserId = userTenantAlbumRecordService.getUseAlbumIdsByUserId(query.getUserId(), query.getClient());
|
|
|
if (CollectionUtils.isNotEmpty(useAlbumIdsByUserId)) {
|
|
|
- List<Long> list = tenantAlbumMusicService.getTenantAlbumMusicIdsByIds(useAlbumIdsByUserId, Arrays.asList(SubjectTypeEnum.COURSEWARE));
|
|
|
+ List<Long> list = tenantAlbumMusicService.getTenantAlbumMusicIdsByIds(useAlbumIdsByUserId, Collections.singletonList(SubjectTypeEnum.COURSEWARE));
|
|
|
if (list.contains(query.getLessonCoursewareId())) {
|
|
|
lessonCoursewareDto.setPlay(true);
|
|
|
}
|