Merge branch 'feature/1015-cbs-music' into dev

mec-application/src/main/java/com/ym/mec/student/controller/MusicSheetController.java

@@ -81,6 +81,8 @@ public class MusicSheetController {
             musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
             // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
+            musicSheetDetail.setScoreType(detail.getScoreType());
+            musicSheetDetail.setIsConvertibleScore(detail.getIsConvertibleScore());
         }
 
         // 设置乐器信息
@@ -122,6 +124,8 @@ public class MusicSheetController {
         } else if (StringUtils.isNotBlank(student.getSubjectIdList())){
             queryInfo.setSubjectId(Integer.parseInt(student.getSubjectIdList()));
         }
+        queryInfo.setPage(query.getPage());
+        queryInfo.setRows(query.getRows());
         queryInfo.setName(query.getName());
         queryInfo.setType("COMMON");
         queryInfo.setClientFlag(true);

mec-application/src/main/java/com/ym/mec/teacher/controller/MusicSheetController.java

@@ -77,6 +77,8 @@ public class MusicSheetController {
             musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
             // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
+            musicSheetDetail.setScoreType(detail.getScoreType());
+            musicSheetDetail.setIsConvertibleScore(detail.getIsConvertibleScore());
         }
 
         // 设置乐器信息
@@ -125,6 +127,9 @@ public class MusicSheetController {
                 queryInfo.setSubjectId(instrument.getSubjectId());
             }
         }
+
+        queryInfo.setPage(query.getPage());
+        queryInfo.setRows(query.getRows());
         queryInfo.setName(query.getName());
         queryInfo.setType("COMMON");
         queryInfo.setClientFlag(true);

mec-application/src/main/java/com/ym/mec/web/controller/MusicSheetController.java

@@ -71,6 +71,8 @@ public class MusicSheetController {
             musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
             // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
+            musicSheetDetail.setScoreType(detail.getScoreType());
+            musicSheetDetail.setIsConvertibleScore(detail.getIsConvertibleScore());
         }
 
         // 设置乐器信息
@@ -107,8 +109,13 @@ public class MusicSheetController {
             Instrument instrument = instrumentService.getById(query.getMusicalInstrumentId());
             if (instrument != null) {
                 queryInfo.setSubjectId(instrument.getSubjectId());
+            } else {
+                queryInfo.setSubjectId(-1);
             }
         }
+
+        queryInfo.setPage(query.getPage());
+        queryInfo.setRows(query.getRows());
         queryInfo.setName(query.getName());
         queryInfo.setRecentFlag(query.getRecentFlag());
         queryInfo.setExcludeMusicId(query.getExcludeMusicId());

mec-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -15,6 +15,7 @@
         <result column="img_" property="img"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="instrumentIds" property="instrumentIds"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 

mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -154,8 +154,9 @@
 		<include refid="queryPageSql"/>
 	</select>
     <select id="querySubjectIds" resultMap="com.ym.mec.biz.dal.dao.SubjectDao.Subject">
-		SELECT s.* FROM sys_music_score sms
+		SELECT s.*,i.id_ as instrumentIds FROM sys_music_score sms
 		LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,sms.subject_ids_)
+        left join instrument i on i.subject_id_ = s.id_
 		WHERE sms.del_flag_ = 0 AND sms.cbs_music_sheet_id_ IS NOT NULL AND s.id_ IS NOT NULL
 		<if test="categoriesIdList != null and categoriesIdList.size > 0">
 			AND sms.cbs_music_categories_id_ IN