|
@@ -104,10 +104,11 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
|
|
|
.last("limit 1").one();
|
|
|
vo.setTenantId(one.getTenantId().toString());
|
|
|
|
|
|
- //查询曲目表
|
|
|
+
|
|
|
TenantInfo tenantInfo = tenantInfoService.getById(one.getTenantId());
|
|
|
vo.setTenantName(tenantInfo.getName());
|
|
|
-
|
|
|
+ vo.setTenantImg(tenantInfo.getLogo());
|
|
|
+ //查询机构专辑曲目表
|
|
|
List<TenantAlbumMusic> tenantAlbumMusics = tenantAlbumMusicService.lambdaQuery()
|
|
|
.eq(TenantAlbumMusic::getTenantAlbumId, i.getId())
|
|
|
.eq(TenantAlbumMusic::getDelFlag, false)
|
|
@@ -137,7 +138,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
|
|
|
List<TenantAlbumWrapper.TenantAlbumSheet> tenantAlbumSheets = value.stream().map(next -> {
|
|
|
|
|
|
TenantAlbumWrapper.TenantAlbumSheet tenantAlbumSheet = new TenantAlbumWrapper.TenantAlbumSheet();
|
|
|
- BeanUtils.copyProperties(value.get(0), tenantAlbumSheet);
|
|
|
+ BeanUtils.copyProperties(next, tenantAlbumSheet);
|
|
|
Long musicSheetId = tenantAlbumSheet.getMusicSheetId();
|
|
|
MusicSheetVo musicSheet = idMsMap.getOrDefault(musicSheetId, new MusicSheetVo());
|
|
|
tenantAlbumSheet.setMusicSheetName(musicSheet.getMusicSheetName());
|
|
@@ -271,28 +272,31 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
|
|
|
//机构专辑封面
|
|
|
String coverImg = tenantAlbum.getCoverImg();
|
|
|
//机构专辑曲目数
|
|
|
- List<TenantAlbumMusic> tenantAlbumMusiclist = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbumId).list();
|
|
|
+ List<TenantAlbumMusic> tenantAlbumMusiclist = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbumId).eq(TenantAlbumMusic::getDelFlag,false).list();
|
|
|
List<Long> MusicSheetIds = tenantAlbumMusiclist.stream().map(TenantAlbumMusic::getMusicSheetId).collect(Collectors.toList());
|
|
|
int size = MusicSheetIds.size();
|
|
|
//Integer musicNum = tenantAlbum.getMusicNum();
|
|
|
|
|
|
//获取合奏曲目数量
|
|
|
List<TenantAlbumMusic> ensembleLits = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getSubjectType, "ENSEMBLE")
|
|
|
- .eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbumId).list();
|
|
|
+ .eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbumId)
|
|
|
+ .eq(TenantAlbumMusic::getDelFlag,false).list();
|
|
|
List<Long> ensembleMusicSheetIds = ensembleLits.stream().map(TenantAlbumMusic::getMusicSheetId).collect(Collectors.toList());
|
|
|
|
|
|
album.setEnsembleCounts(ensembleMusicSheetIds.size());
|
|
|
|
|
|
//获取小曲目的曲目数量
|
|
|
List<TenantAlbumMusic> musicLists = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getSubjectType, "MUSIC")
|
|
|
- .eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbumId).list();
|
|
|
+ .eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbumId)
|
|
|
+ .eq(TenantAlbumMusic::getDelFlag,false).list();
|
|
|
List<Long> musicSheetIds = musicLists.stream().map(TenantAlbumMusic::getMusicSheetId).collect(Collectors.toList());
|
|
|
|
|
|
album.setMusicCounts(musicSheetIds.size());
|
|
|
|
|
|
//获取声部的曲目数量
|
|
|
List<TenantAlbumMusic> subjectLists = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getSubjectType, "SUBJECT")
|
|
|
- .eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbumId).list();
|
|
|
+ .eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbumId)
|
|
|
+ .eq(TenantAlbumMusic::getDelFlag,false).list();
|
|
|
List<Long> subjectSheetIds = subjectLists.stream().map(TenantAlbumMusic::getMusicSheetId).collect(Collectors.toList());
|
|
|
|
|
|
album.setSubjectCounts(subjectSheetIds.size());
|