Merge branch 'zx_saas_cbs' of http://git.dayaedu.com/yonge/mec into dev

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -211,9 +211,8 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             if(pageInfo != null && CollectionUtils.isNotEmpty(pageInfo.getRows())){
                 Map<Long, CbsMusicSheetWrapper.MusicSheetApplication> musicSheetApplicationMap = pageInfo.getRows()
                         .stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, Function.identity()));
-                List<Subject> subjects = subjectDao.queryCbsList(records.stream().map(SysMusicScore::getSubjectIds)
-                        .filter(StringUtils::isNotEmpty).map(Long::parseLong).distinct().collect(Collectors.toList()));
-                Map<Integer, Subject> subjectMap = subjects.stream().collect(Collectors.toMap(Subject::getId, Function.identity()));
+                List<Subject> subjects = subjectDao.queryCbsList(null);
+                Map<Long, Subject> subjectMap = subjects.stream().collect(Collectors.toMap(Subject::getCbsSubjectId, Function.identity()));
                 for (SysMusicScore record : records) {
                     CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = musicSheetApplicationMap.get(record.getCbsMusicSheetId());
                     if(musicSheetApplication != null){
@@ -246,11 +245,11 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         }
     }
 
-    public void initMusicSheetVo(SysMusicScore record,CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication,Map<Integer, Subject> subjectMap){
+    public void initMusicSheetVo(SysMusicScore record,CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication,Map<Long, Subject> subjectMap){
         if(StringUtils.isNotEmpty(musicSheetApplication.getSubjectIds())){
             StringBuffer sb = new StringBuffer();
             for (String s : musicSheetApplication.getSubjectIds().split(",")) {
-                Subject subject = subjectMap.get(Integer.parseInt(s));
+                Subject subject = subjectMap.get(Long.parseLong(s));
                 if(subject != null){
                     if (sb.length() > 0) {
                         sb.append(",");
@@ -274,10 +273,12 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
             record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
+            record.setUrl(accompanimentList.get(0).getAudioFileUrl());
         }
         List<CbsMusicSheetWrapper.MusicSheetSound> soundList = musicSheetApplication.getMusicSheetSoundList();
         if (CollectionUtils.isNotEmpty(soundList)) {
             record.setAccompanimentMetronomeUrl(soundList.get(0).getAudioFileUrl());
+            record.setAccompanimentUrl(soundList.get(0).getAudioFileUrl());
         }
         record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
         record.setMidiUrl(musicSheetApplication.getMidiFileUrl());

mec-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -310,7 +310,7 @@
         SELECT * FROM `subject` where name_ IN ('长笛','单簧管','萨克斯','小号','长号','圆号','上低音号','大号','打击乐') and del_flag_ = 0
     </select>
     <select id="queryCbsList" resultMap="Subject">
-        SELECT * FROM `subject` WHERE del_flag_ = 0 AND parent_subject_id_ != 0
+        SELECT * FROM `subject` WHERE del_flag_ = 0 AND parent_subject_id_ != 0 AND cbs_subject_id_ IS NOT NULL
         <if test="cbsSubjectIds != null and cbsSubjectIds.size > 0">
             AND cbs_subject_id_ IN
             <foreach collection="cbsSubjectIds" item="cbsSubjectId" open="(" close=")" separator=",">