Merge branch 'feature/250324_fix' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/io/request/music/MusicCompareVo.java

@@ -147,6 +147,10 @@ public class MusicCompareVo implements Serializable {
         @ApiModelProperty("曲目ID")
         private Long musicSheetId;
 
+
+        @ApiModelProperty("曲目ID")
+        private String cbsMusicSheetId;
+
         @ApiModelProperty("曲目名称")
         private String musicName;
 

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

@@ -29,7 +29,11 @@ public class HomeMusicSheetVo {
     public static class MusicSheetSmall{
 
         @ApiModelProperty("曲目编号")
-        private String  musicSheetId;
+        private Long  musicSheetId;
+
+
+        @ApiModelProperty("曲目编号")
+        private String cbsMusicSheetId;
 
         @ApiModelProperty("曲目名称")
         private String musicSheetName;
@@ -37,12 +41,19 @@ public class HomeMusicSheetVo {
         @ApiModelProperty("付费人数")
         private Integer num;
 
+        public String getCbsMusicSheetId() {
+            return cbsMusicSheetId;
+        }
+
+        public void setCbsMusicSheetId(String cbsMusicSheetId) {
+            this.cbsMusicSheetId = cbsMusicSheetId;
+        }
 
-        public String getMusicSheetId() {
+        public Long getMusicSheetId() {
             return musicSheetId;
         }
 
-        public void setMusicSheetId(String musicSheetId) {
+        public void setMusicSheetId(Long musicSheetId) {
             this.musicSheetId = musicSheetId;
         }
 

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

@@ -175,7 +175,11 @@ public class MusicCompareWrapper {
         private Long id;
 
         @ApiModelProperty("曲目ID")
-        private String musicSheetId;
+        private Long musicSheetId;
+
+
+        @ApiModelProperty("曲目ID")
+        private String cbsMusicSheetId;
 
         @ApiModelProperty("客户端标识")
         private ClientEnum clientId;

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

@@ -25,7 +25,8 @@
     <resultMap id="MusicCompareRecordPageResultMap"
                type="com.yonge.cooleshow.biz.dal.wrapper.music.MusicCompareWrapper$RecordInfo">
         <id column="id_" property="id" />
-        <result column="cbs_music_sheet_id_" property="musicSheetId" />
+        <result column="music_sheet_id_" property="musicSheetId" />
+        <result column="cbs_music_sheet_id_" property="cbsMusicSheetId" />
         <result column="train_duration_" property="trainDuration" />
         <result column="train_frequency_" property="trainFrequency" />
         <result column="evaluate_duration_" property="evaluateDuration" />
@@ -36,7 +37,7 @@
         <result column="music_tag_" property="musicTag" />
     </resultMap>
     <select id="selectMusicCompareRecordPage" resultMap="MusicCompareRecordPageResultMap">
-        SELECT t1.id_, t2.cbs_music_sheet_id_, t1.user_id_, t1.train_duration_, t1.train_frequency_, t1.evaluate_duration_, t1.evaluate_frequency_, t1.recent_time_, t2.music_sheet_name_, t2.composer_, t2.music_tag_
+        SELECT t1.id_, t1.music_sheet_id_,t2.cbs_music_sheet_id_, t1.user_id_, t1.train_duration_, t1.train_frequency_, t1.evaluate_duration_, t1.evaluate_frequency_, t1.recent_time_, t2.music_sheet_name_, t2.composer_, t2.music_tag_
         FROM music_compare_record_stat t1 LEFT JOIN music_sheet t2 ON t1.music_sheet_id_ = t2.id_
         <where>
             t2.cbs_music_sheet_id_ is not null

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

@@ -837,7 +837,8 @@
     <select id="selectPayMusicSheet" resultType="com.yonge.cooleshow.biz.dal.vo.HomeMusicSheetVo$MusicSheetSmall">
 
         SELECT
-            ms.cbs_music_sheet_id_ as musicSheetId,
+            ms.id_ as musicSheetId,
+            ms.cbs_music_sheet_id_ as cbsMusicSheetId,
             ms.music_sheet_name_ as musicSheetName,
             count(DISTINCT pr.student_id_) as num
         FROM