|
@@ -27,6 +27,7 @@ import com.yonge.cooleshow.biz.dal.wrapper.LessonCoursewareWrapper;
|
|
import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumMusicWrapper;
|
|
import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumMusicWrapper;
|
|
import com.yonge.cooleshow.common.constant.SysConfigConstant;
|
|
import com.yonge.cooleshow.common.constant.SysConfigConstant;
|
|
import com.yonge.cooleshow.common.enums.YesOrNoEnum;
|
|
import com.yonge.cooleshow.common.enums.YesOrNoEnum;
|
|
|
|
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
@@ -113,8 +114,8 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
|
|
if (CollectionUtils.isEmpty(musicSheets)) {
|
|
if (CollectionUtils.isEmpty(musicSheets)) {
|
|
return page.setRecords(musicSheets);
|
|
return page.setRecords(musicSheets);
|
|
}
|
|
}
|
|
- CbsMusicSheetWrapper.MusicSheetApplicationQuery cbsQuery = musicSheetService.getMusicSheetApplicationQuery();
|
|
|
|
- List<Long> cbsMusicSheetIds = musicSheets.stream().map(TenantAlbumMusicWrapper.StudentTenantAlbumMusic::getCbsMusicSheetId).collect(Collectors.toList());
|
|
|
|
|
|
+ CbsMusicSheetWrapper.MusicSheetApplicationQuery cbsQuery = musicSheetService.getMusicSheetApplicationQuery(SourceTypeEnum.TENANT);
|
|
|
|
+ List<Long> cbsMusicSheetIds = musicSheets.stream().map(e -> e.getCbsMusicSheetId()).collect(Collectors.toList());
|
|
cbsQuery.setMusicSheetIds(cbsMusicSheetIds);
|
|
cbsQuery.setMusicSheetIds(cbsMusicSheetIds);
|
|
cbsQuery.setRows(cbsMusicSheetIds.size());
|
|
cbsQuery.setRows(cbsMusicSheetIds.size());
|
|
List<CbsMusicSheetWrapper.MusicSheetApplication> rows = musicSheetService.queryCbsMusicSheetApplication(cbsQuery);
|
|
List<CbsMusicSheetWrapper.MusicSheetApplication> rows = musicSheetService.queryCbsMusicSheetApplication(cbsQuery);
|