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

@@ -270,25 +270,27 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             throw new BizException("请先下架曲目再修改");
         }
         CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = this.checkRecord(musicSheetAuthRecord);
-        MusicSheet musicSheet = musicSheetService.initMusicSheet(addMusicSheet);
-        musicSheet.setCbsMusicSheetId(musicSheet1.getCbsMusicSheetId());
-        musicSheet.setId(musicSheet1.getId());
+//        MusicSheet musicSheet = musicSheetService.initMusicSheet(addMusicSheet);
+//        musicSheet.setCbsMusicSheetId(musicSheet1.getCbsMusicSheetId());
+//        musicSheet.setId(musicSheet1.getId());
 //        musicSheetService.removeById(record.getMusicSheetId());
-        musicSheetAccompanimentService.delByMusicSheetId(record.getMusicSheetId());
+//        musicSheetAccompanimentService.delByMusicSheetId(record.getMusicSheetId());
+        musicSheet1.setDelFlag(true);
+        musicSheetService.updateById(musicSheet1);
         if(record.getAuditState() == AuthStatusEnum.DOING){
             //保存曲目信息
-            musicSheetService.updateById(musicSheet);
-            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
-            musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
-            record.setMusicSheetId(musicSheet.getId());
+//            musicSheetService.updateById(musicSheet);
+//            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
+//            musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
+            record.setMusicSheetId(musicSheet1.getId());
             record.setMusicSheetJson(musicSheetAuthRecord.getMusicSheetJson());
             baseMapper.updateById(record);
         }else {
             //保存曲目信息
-            musicSheetService.updateById(musicSheet);
-            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
-            musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
-            musicSheetAuthRecord.setMusicSheetId(musicSheet.getId());
+//            musicSheetService.updateById(musicSheet);
+//            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
+//            musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
+            musicSheetAuthRecord.setMusicSheetId(musicSheet1.getId());
             musicSheetAuthRecord.setBatchNo(record.getBatchNo());
             musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
             musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));