酷乐秀曲目来源改为内容平台

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

@@ -259,7 +259,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         if(musicSheetAuthRecord.getId() == null){
             throw new BizException("先选择要修改的曲目");
         }
-        MusicSheetAuthRecord record = this.lambdaQuery().eq(MusicSheetAuthRecord::getMusicSheetId, musicSheetAuthRecord.getId()).last("LIMIT 1").one();
+        MusicSheetAuthRecord record = this.lambdaQuery().eq(MusicSheetAuthRecord::getId, musicSheetAuthRecord.getId()).last("LIMIT 1").one();
         if (record == null){
             throw new BizException("审核记录不存在");
         }
@@ -278,15 +278,15 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
 //        musicSheetAccompanimentService.delByMusicSheetId(record.getMusicSheetId());
         musicSheet1.setDelFlag(true);
         musicSheetService.updateById(musicSheet1);
-        if(record.getAuditState() == AuthStatusEnum.DOING){
+        record.setAuditState(AuthStatusEnum.DOING);
+        record.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
+        baseMapper.updateById(record);
+        /*if(record.getAuditState() == AuthStatusEnum.DOING){
             //保存曲目信息
 //            musicSheetService.updateById(musicSheet);
 //            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
 //            musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
             record.setMusicSheetId(musicSheet1.getId());
-            record.setAuditState(AuthStatusEnum.DOING);
-            record.setMusicSheetJson(musicSheetAuthRecord.getMusicSheetJson());
-            baseMapper.updateById(record);
         }else {
             //保存曲目信息
 //            musicSheetService.updateById(musicSheet);
@@ -297,7 +297,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
             musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
             baseMapper.updateById(musicSheetAuthRecord);
-        }
+        }*/
     }
 
     @Override

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

@@ -601,7 +601,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = JSON.parseObject(musicSheetJson, CbsMusicSheetWrapper.AddMusicSheet.class);
                     MusicSheetWrapper.MusicSheetDetailVo musicSheetDetailVo = new MusicSheetWrapper.MusicSheetDetailVo();
                     musicSheetService.initMusicSheetDetailVo(addMusicSheet,musicSheetDetailVo);
-                    return JSON.parseObject(JSON.toJSONString(musicSheetDetailVo),MusicSheetDetailVo.class);
+                    MusicSheetDetailVo result = JSON.parseObject(JSON.toJSONString(musicSheetDetailVo), MusicSheetDetailVo.class);
+                    result.setMusicSheetAuthRecordId(record.getId().toString());
+                    return result;
                 }
             }
             if(detailVo == null){

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetDetailVo.java

@@ -22,6 +22,9 @@ public class MusicSheetDetailVo extends MusicSheet {
     @ApiModelProperty("曲谱伴奏")
     private List<MusicSheetAccompaniment> background;
 
+    @ApiModelProperty("曲目审核编号")
+    private String musicSheetAuthRecordId;
+
     @ApiModelProperty("是否能播放（0：否，1：是） 学生端进入小酷Ai判断 试用/完整 播放")
     private YesOrNoEnum play;