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/dto/req/TeacherMusicSheetAuditReq.java

@@ -72,6 +72,9 @@ public class TeacherMusicSheetAuditReq {
 
     private AccompanimentTypeEnum accompanimentType;
 
+    @ApiModelProperty(value = "单曲、合奏")
+    private String musicSheetType;
+
     @ApiModelProperty(value = "音频文件存储路径")
     private String audioFileUrl;  //音频文件存储路径
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayaedu.cbs.common.enums.music.EAudioType;
 import com.dayaedu.cbs.common.enums.music.EMusicAvailableType;
+import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
@@ -96,6 +97,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         addMusicSheet.setIsConvertibleScore(param.getNotation()==YesOrNoEnum.YES);
         addMusicSheet.setExtConfigJson(param.getExtConfigJson());
         addMusicSheet.setAudioType(EAudioType.valueOf(param.getAccompanimentType().getCode()));
+        addMusicSheet.setMusicSheetType(EMusicSheetType.valueOf(param.getMusicSheetType()));
         musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
         MusicSheet musicSheet = musicSheetService.getById(musicSheetAuthRecord.getMusicSheetId());
         if (musicSheet == null) {

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

@@ -2003,7 +2003,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             addMusicSheet.setStatus(true);
         }
         if (addMusicSheet.getMusicSheetType() == null) {
-            addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
+            addMusicSheet.setMusicSheetType(EMusicSheetType.SINGLE);
         }
         if (addMusicSheet.getMusicCategoryId() == null) {
             addMusicSheet.setMusicCategoryId(-2L);