Merge branch 'feature/1108_audio' into test

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetCbsController.java

@@ -118,6 +118,7 @@ public class MusicSheetCbsController extends BaseController {
         musicSheetDetail.setExquisiteFlag(musicSheet.getExquisiteFlag());
         musicSheetDetail.setMusicSubject(musicSheet.getMusicSubject());
         musicSheetDetail.setUserId(musicSheet.getCreateBy());
+        musicSheetDetail.setAuditStatus(musicSheet.getAuditStatus());
         musicSheetDetail.setFavorite(musicFavoriteService.checkFavorite(id,sysUser.getId(),ClientEnum.STUDENT,null));
         // 如果是合奏 并且乐器ID = 2268
         musicSheetDetail.setSpecialPercussionFlag(false);

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetCbsController.java

@@ -100,7 +100,7 @@ public class MusicSheetCbsController extends BaseController {
             if (SourceTypeEnum.PLATFORM.name().equals(providerType)) {
                 tenantAlbumId = null;
             } else {
-                tenantAlbumId = StringUtils.isBlank(tenantAlbumId) ? null : "1";
+                tenantAlbumId = "1";
             }
         }
 
@@ -122,6 +122,7 @@ public class MusicSheetCbsController extends BaseController {
         musicSheetDetail.setExquisiteFlag(musicSheet.getExquisiteFlag());
         musicSheetDetail.setMusicSubject(musicSheet.getMusicSubject());
         musicSheetDetail.setUserId(musicSheet.getCreateBy());
+        musicSheetDetail.setAuditStatus(musicSheet.getAuditStatus());
         musicSheetDetail.setFavorite(musicFavoriteService.checkFavorite(id,sysUser.getId(),ClientEnum.STUDENT,null));
         CourseCourseware one = courseCoursewareService.lambdaQuery()
                 .eq(CourseCourseware::getMusicSheetId, id)

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -78,7 +78,7 @@ public class MusicSheetController extends BaseController {
             if (SourceTypeEnum.PLATFORM.name().equals(providerType)) {
                 tenantAlbumId = null;
             } else {
-                tenantAlbumId = StringUtils.isBlank(tenantAlbumId) ? null : "1";
+                tenantAlbumId =  "1";
             }
         }
 

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
@@ -109,6 +110,9 @@ public class MusicSheetVo extends MusicSheet {
         @ApiModelProperty(value = "课件编号")
         private Long coursewareId;
 
+        @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
+        private AuthStatusEnum auditStatus;
+
     }
 
 }