酷乐秀曲目来源改为内容平台

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseCoursewareServiceImpl.java

@@ -80,43 +80,11 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
             return courseCoursewareVoIPage;
         }
         Map<Long, String> userIdUsernameMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getId, SysUser::getUsername));
-        /*//获取曲目关联的伴奏
-        List<Long> musicSheetIds = records.stream().map(e -> e.getMusicSheetId()).distinct().collect(Collectors.toList());
-        Map<Long, MusicSheetAccompaniment> accoompanimentMap = musicSheetAccompanimentDao.selectList(
-                        Wrappers.<MusicSheetAccompaniment>lambdaQuery()
-                                .in(MusicSheetAccompaniment::getMusicSheetId, musicSheetIds)).stream()
-                .collect(Collectors.groupingBy(MusicSheetAccompaniment::getMusicSheetId, Collectors.collectingAndThen(Collectors.toList(), e -> e.get(0))));
-        for (CourseCoursewareVo record : records) {
-            record.setUsername(userIdUsernameMap.get(record.getUserId()));
-            MusicSheetAccompaniment musicSheetAccompaniment = accoompanimentMap.get(record.getMusicSheetId());
-            if (musicSheetAccompaniment != null) {
-                record.setMusicSheetAccompanimentId(musicSheetAccompaniment.getId());
-            }
-        }
-
-        // 设置原音
-        List<Long> musicSheetIdList = records.stream().map(CourseCoursewareVo::getMusicSheetId).collect(Collectors.toList());
-        List<MusicSheetAccompaniment> musicSheetAccompanimentList = musicSheetAccompanimentDao.selectList(
-                Wrappers.<MusicSheetAccompaniment>lambdaQuery()
-                        .in(MusicSheetAccompaniment::getMusicSheetId, musicSheetIdList));
-        if (CollectionUtils.isNotEmpty(musicSheetAccompanimentList)) {
-            Map<Long, List<MusicSheetAccompaniment>> map = musicSheetAccompanimentList.stream()
-                                                          .collect( Collectors.groupingBy(MusicSheetAccompaniment::getMusicSheetId));
-            for (CourseCoursewareVo record : records) {
-                List<MusicSheetAccompaniment> musicSheetAccompaniments = map.get(record.getMusicSheetId());
-                if (CollectionUtils.isEmpty(musicSheetAccompaniments)) {
-                    continue;
-                }
-                String url = musicSheetAccompaniments.stream()
-                                                         .map(MusicSheetAccompaniment::getAudioFileUrl)
-                                                         .collect(Collectors.joining(","));
-                record.setMp3url(url);
-            }
-        }*/
         //获取内容平台曲目信息
         List<Long> cbsMusicSheetIds = records.stream().map(e -> e.getCbsMusicSheetId()).collect(Collectors.toList());
         CbsMusicSheetWrapper.MusicSheetApplicationQuery applicationQuery = musicSheetService.getMusicSheetApplicationQuery();
         applicationQuery.setMusicSheetIds(cbsMusicSheetIds);
+        applicationQuery.setRows(cbsMusicSheetIds.size());
         List<CbsMusicSheetWrapper.MusicSheetApplication> applications = musicSheetService.queryCbsMusicSheetApplication(applicationQuery);
         if(CollectionUtils.isNotEmpty(applications)){
             Map<Long, CbsMusicSheetWrapper.MusicSheetApplication> applicationMap = applications.stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, e -> e));

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseCoursewareMapper.xml

@@ -34,7 +34,7 @@
 		FROM course_courseware t
         left join music_sheet ms on t.music_sheet_id_ = ms.id_
         <where>
-            t.del_flag_ = 0
+            t.del_flag_ = 0 AND ms.cbs_music_sheet_id_ IS NOT NULL
             <if test="param.userId != null">
                 and t.user_id_ = #{param.userId}
             </if>
@@ -51,7 +51,7 @@
                 </foreach>
             </if>
             <if test="param.subjectIdList != null and param.subjectIdList.size() != 0">
-                and (ms.music_subject_ is null or ms.music_subject_ = '' or ms.music_sheet_type_ = 'CONCERT'
+                and (ms.music_subject_ is null or ms.music_subject_ = '' OR ms.music_sheet_type_ = 'CONCERT' OR
                 <foreach collection="param.subjectIdList" separator="or" item="item" open="(" close=")">
                     find_in_set(#{item},ms.music_subject_)
                 </foreach>)