Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -298,6 +298,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
                 if(StringUtils.isNotEmpty(musicSheetJson)){
                     CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = JSON.parseObject(musicSheetJson, CbsMusicSheetWrapper.AddMusicSheet.class);
                     musicSheetService.initMusicSheetDetailVo(addMusicSheet,sheetDetailVo);
+                    sheetDetailVo.setMusicSheetJson(null);
                     sheetDetailVo.setSubmitAuditTime(sheetDetailVo.getCreateTime());
                 }
             }

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

@@ -2103,6 +2103,19 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
             musicSheetAudit.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
         }
+        List<CbsMusicSheetWrapper.MusicSheetSound> soundList = addMusicSheet.getMusicSheetSoundList();
+        if (CollectionUtils.isNotEmpty(soundList)) {
+            List<MusicSheetAccompaniment> background = new ArrayList<>();
+            for (CbsMusicSheetWrapper.MusicSheetSound sound : soundList) {
+                MusicSheetAccompaniment musicSheetAccompaniment = new MusicSheetAccompaniment();
+                musicSheetAccompaniment.setAudioFileUrl(sound.getAudioFileUrl());
+                musicSheetAccompaniment.setSortNumber(sound.getSortNumber());
+                musicSheetAccompaniment.setTrack(sound.getTrack());
+                musicSheetAccompaniment.setMusicalInstrumentId(sound.getMusicalInstrumentId());
+                background.add(musicSheetAccompaniment);
+            }
+            musicSheetAudit.setBackground(background);
+        }
         musicSheetAudit.setXmlFileUrl(addMusicSheet.getXmlFileUrl());
         musicSheetAudit.setMidiUrl(addMusicSheet.getMidiFileUrl());
         List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> extend = addMusicSheet.getAddMusicSheetApplicationExtend();