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

@@ -275,10 +275,15 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
 //        musicSheetAccompanimentService.delByMusicSheetId(record.getMusicSheetId());
         musicSheet1.setDelFlag(true);
         musicSheetService.updateById(musicSheet1);
-        record.setAuditState(AuthStatusEnum.DOING);
+        musicSheetAuthRecord.setMusicSheetId(musicSheet1.getId());
+        musicSheetAuthRecord.setBatchNo(record.getBatchNo());
+        musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
+        musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
+        baseMapper.insert(musicSheetAuthRecord);
+        /*record.setAuditState(AuthStatusEnum.DOING);
         record.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
         baseMapper.updateById(record);
-        /*if(record.getAuditState() == AuthStatusEnum.DOING){
+        if(record.getAuditState() == AuthStatusEnum.DOING){
             //保存曲目信息
 //            musicSheetService.updateById(musicSheet);
 //            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
@@ -289,11 +294,6 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
 //            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));
-            baseMapper.updateById(musicSheetAuthRecord);
         }*/
     }