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

@@ -21,6 +21,7 @@ import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
 import com.yonge.cooleshow.biz.dal.wrapper.AddMusicSheetWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.InstrumentWrapper;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.service.IdGeneratorService;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
@@ -234,22 +235,28 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         }
         MusicSheetAuthRecord record = baseMapper.selectById(musicSheetAuthRecord.getId());
         if (record == null){
+            throw new BizException("审核记录不存在");
+        }
+        MusicSheet musicSheet1 = musicSheetService.getById(record.getMusicSheetId());
+        if (musicSheet1 == null){
             throw new BizException("曲目信息不存在");
         }
+        if (musicSheet1.getState() == YesOrNoEnum.YES){
+            throw new BizException("请先下架曲目再修改");
+        }
         CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = this.checkRecord(musicSheetAuthRecord);
         MusicSheet musicSheet = musicSheetService.initMusicSheet(addMusicSheet);
-        MusicSheet musicSheet1 = musicSheetService.getById(record.getMusicSheetId());
         musicSheet.setCbsMusicSheetId(musicSheet1.getCbsMusicSheetId());
-        if(record.getAuditState() == AuthStatusEnum.DOING){
-            musicSheetService.removeById(record.getMusicSheetId());
-            musicSheetAccompanimentService.delByMusicSheetId(record.getMusicSheetId());
-            //保存曲目信息
-            musicSheetService.save(musicSheet);
-            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
-            musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
-            record.setMusicSheetId(musicSheet.getId());
-            record.setMusicSheetJson(musicSheetAuthRecord.getMusicSheetJson());
-            baseMapper.updateById(record);
+        musicSheetService.removeById(record.getMusicSheetId());
+        musicSheetAccompanimentService.delByMusicSheetId(record.getMusicSheetId());
+        //保存曲目信息
+        musicSheetService.save(musicSheet);
+        List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
+        musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
+        record.setMusicSheetId(musicSheet.getId());
+        record.setMusicSheetJson(musicSheetAuthRecord.getMusicSheetJson());
+        baseMapper.updateById(record);
+        /*if(record.getAuditState() == AuthStatusEnum.DOING){
         }else {
             //保存曲目信息
             musicSheetService.save(musicSheet);
@@ -260,7 +267,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
             musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
             baseMapper.insert(musicSheetAuthRecord);
-        }
+        }*/
     }
 
     @Override