Merge branch 'feature/0904_music' into test

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

@@ -2164,6 +2164,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         musicSheetAudit.setTitleImg(addMusicSheet.getMusicCover());
         musicSheetAudit.setExtConfigJson(addMusicSheet.getExtConfigJson());
         musicSheetAudit.setRemark(addMusicSheet.getRemark());
+        if (CollectionUtils.isNotEmpty(addMusicSheet.getAddMusicSheetApplicationExtend())) {
+            EDefaultScoreType scoreType = addMusicSheet.getAddMusicSheetApplicationExtend().get(0).getScoreType();
+            musicSheetAudit.setScoreType(scoreType!=null?scoreType.name():EDefaultScoreType.STAVE.getCode());
+        }
         if(addMusicSheet.getAudioType() != null){
             musicSheetAudit.setAccompanimentType(AccompanimentTypeEnum.valueOf(addMusicSheet.getAudioType().getCode()));
         }
@@ -2281,6 +2285,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 musicSheetAudit.setPaymentType(applicationExtend.getPaymentType());
                 musicSheetAudit.setChargeType(ChargeTypeEnum.valueOf(applicationExtend.getPaymentType()));
             }
+
+            EDefaultScoreType scoreType = addMusicSheet.getAddMusicSheetApplicationExtend().get(0).getScoreType();
+            musicSheetAudit.setScoreType(scoreType!=null?scoreType.name():EDefaultScoreType.STAVE.getCode());
             if(applicationExtend.getTopFlag() != null){
                 musicSheetAudit.setTopFlag(applicationExtend.getTopFlag()? YesOrNoEnum.YES: YesOrNoEnum.NO);
             }
@@ -2376,6 +2383,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 musicSheetAudit.setPaymentType(applicationExtend.getPaymentType());
                 musicSheetAudit.setChargeType(ChargeTypeEnum.valueOf(applicationExtend.getPaymentType()));
             }
+
+            EDefaultScoreType scoreType = addMusicSheet.getAddMusicSheetApplicationExtend().get(0).getScoreType();
+            musicSheetAudit.setScoreType(scoreType!=null?scoreType.name():EDefaultScoreType.STAVE.getCode());
             if(applicationExtend.getTopFlag() != null){
                 musicSheetAudit.setTopFlag(applicationExtend.getTopFlag()? YesOrNoEnum.YES: YesOrNoEnum.NO);
             }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/MusicSheetWrapper.java

@@ -137,6 +137,11 @@ public class MusicSheetWrapper {
         @ApiModelProperty("添加人")
         private String addName;
 
+
+        @ApiModelProperty("谱面类型")
+        @TableField("score_type_")
+        private String scoreType;
+
         @ApiModelProperty("添加头像（老师头像）")
         private String addUserAvatar;
 
@@ -552,6 +557,9 @@ public class MusicSheetWrapper {
         @ApiModelProperty(value = "备注")
         private String remark;  //备注，填写未通过审核的原因
 
+        @ApiModelProperty("谱面类型")
+        @TableField("score_type_")
+        private String scoreType;
 
         @TableField("ext_config_json_")
         @ApiModelProperty("曲目配置信息")

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -494,6 +494,7 @@
         <result column="tenantCategoryId" jdbcType="VARCHAR" property="tenantCategoryId"/>
         <result column="tenantScoreType" jdbcType="VARCHAR" property="tenantScoreType"/>
         <result column="tenantDelFlag" jdbcType="VARCHAR" property="tenantDelFlag"/>
+        <result column="scoreType" jdbcType="VARCHAR" property="scoreType"/>
         <collection property="background" ofType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
             <id column="accompanimentId" jdbcType="BIGINT" property="id"/>
             <result column="accompanimentMusicSheetId" jdbcType="BIGINT" property="musicSheetId"/>