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

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

@@ -113,10 +113,6 @@ public class MusicSheetController extends BaseController {
                                                        ClientEnum.STUDENT, OrderTypeEnum.MUSIC));
     }
 
-
-    /**
-     * 置顶
-     */
     @PostMapping("/top/{id}")
     @ApiOperation(value = "置顶曲目", notes = "传入id")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/top')")

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.wrapper;
 
+import com.dayaedu.cbs.common.enums.music.EDefaultScoreType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,23 +15,38 @@ public class MusicSheetApplicationExtendWrapper {
     private @NotNull(
             message = "曲目ID不能为空"
     ) Long musicSheetId;
+
     @ApiModelProperty("分类ID")
     private Long musicSheetCategoryId;
+
     @ApiModelProperty("启用状态")
     private Boolean status;
+
     @ApiModelProperty("排序")
     private Integer sortNo;
+
     @ApiModelProperty("收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
     private String paymentType;
+
     @ApiModelProperty("是否置顶(0:否;1:是)")
     private Boolean topFlag;
+
     @ApiModelProperty("精品标志")
     private Boolean exquisiteFlag;
+
     @ApiModelProperty("可用途径 TENANT 机构 PLATFORM 平台")
     private String availableType;
+
     @ApiModelProperty("曲目标签(多个标签用逗号分隔)")
     private String musicTagIds;
+
     @ApiModelProperty("曲目价格")
     private BigDecimal musicPrice;
 
+    @ApiModelProperty("是否可转谱(0:否; 1:是)")
+    private Boolean isConvertibleScore;
+
+    @ApiModelProperty("谱面类型")
+    private EDefaultScoreType scoreType;
+
 }

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

@@ -116,7 +116,7 @@
     </select>
     <select id="tagList"
             resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetTagWrapper$MusicSheetTag">
-        SELECT t.id_ id,t.name_ name FROM music_tag t
+        SELECT t.id_ id,t.name_,t.state_ enable FROM music_tag t
         <where>
             <if test="param.ids != null and param.ids.size > 0">
                 and t.id_ IN
@@ -134,7 +134,7 @@
     </select>
     <select id="categoryList"
             resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetCategoryWrapper$MusicSheetCategory">
-        SELECT t.id_ id,t.name_ name,t.parent_tag_id_ parentId FROM music_tag t
+        SELECT t.id_ id,t.name_ name,t.state_ enable,t.parent_tag_id_ parentId FROM music_tag t
         <where>
             <if test="param.ids != null and param.ids.size > 0">
                 and t.id_ IN