去掉曲目分类

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

@@ -70,9 +70,9 @@ public class SysMusicScoreCategoriesController extends BaseController {
     @ApiOperation(value = "树状列表")
     @GetMapping("/queryTree")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/queryTree')")
-    public Object queryTree(MusicScoreQueryInfo queryInfo) {
+    public Object queryTree() {
         //queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
-        return succeed(cbsMusicScoreCategoriesService.queryTree(queryInfo));
+        return succeed(cbsMusicScoreCategoriesService.queryTreeByAppId());
     }
 
 /*    @ApiOperation(value = "获取分类详情")

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScore.java

@@ -55,6 +55,9 @@ public class SysMusicScore {
 
 	/** 名称 */
 	private Integer categoriesId;
+
+	/** 内容平台曲目分类编号 */
+	private Integer cbsMusicCategoriesId;
 	
 	/** 类型PERSON 个人,COMMON公用 */
 	private ExamSongTypeEnum type;

mec-biz/src/main/java/com/ym/mec/biz/service/CbsMusicScoreCategoriesService.java

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 
 import java.util.List;
+import java.util.Map;
 
 public interface CbsMusicScoreCategoriesService {
 
@@ -17,4 +18,8 @@ public interface CbsMusicScoreCategoriesService {
     List<SysMusicScoreCategories> queryByIds(String ids);
 
     List<SysMusicScoreCategories> queryCategoriesTreeList(String categoryIdList, Boolean isQueryEnable);
+
+    Map<Integer,String> getCategoriesNameMap(List<Integer> categoriesIds);
+
+    List<SysMusicScoreCategories> queryTreeByAppId();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CbsMusicScoreCategoriesServiceImpl.java

@@ -9,11 +9,13 @@ import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.biz.service.CbsMusicScoreCategoriesService;
 import com.ym.mec.common.exception.BizException;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -21,6 +23,8 @@ public class CbsMusicScoreCategoriesServiceImpl implements CbsMusicScoreCategori
 
 	@Resource
 	private MusicFeignClientService musicFeignClientService;
+	@Value("${openfeign-client.app-id:1745637981387108354}")
+	public Long applicationId;
 
 	@Override
 	public List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo) {
@@ -104,6 +108,25 @@ public class CbsMusicScoreCategoriesServiceImpl implements CbsMusicScoreCategori
 		return rows;
 	}
 
+	@Override
+	public Map<Integer, String> getCategoriesNameMap(List<Integer> categoriesIds) {
+		R<Map<Integer, String>> mapR = musicFeignClientService.getCategoryNames(categoriesIds);
+		if (mapR.getCode() != 200) {
+			throw new BizException("查询曲目分类失败,{}", mapR.getMessage());
+		}
+		return mapR.feignData();
+	}
+
+	@Override
+	public List<SysMusicScoreCategories> queryTreeByAppId() {
+		R<List<MusicSheetCategoriesWrapper.MusicSheetCategories>> listR = musicFeignClientService.queryTreeByAppId(applicationId);
+		if (listR.getCode() != 200) {
+			throw new BizException("查询曲目分类失败,{}", listR.getMessage());
+		}
+		List<MusicSheetCategoriesWrapper.MusicSheetCategories> musicSheetCategories = listR.feignData();
+		return musicSheetCategories.stream().map(this::convertMusicSheetCategoryToSysMusicScoreCategory).collect(Collectors.toList());
+	}
+
 	public SysMusicScoreCategories getParentTree(SysMusicScoreCategories sysMusicScoreCategories) {
 		if (sysMusicScoreCategories != null && sysMusicScoreCategories.getParentId() > 0) {
 			List<SysMusicScoreCategories> categories = this.queryByIds(sysMusicScoreCategories.getParentId().toString());
@@ -138,6 +161,7 @@ public class CbsMusicScoreCategoriesServiceImpl implements CbsMusicScoreCategori
 		musicSheetCategory.setParentId(Long.valueOf(sysMusicScoreCategory.getParentId()));
 		musicSheetCategory.setEnable(sysMusicScoreCategory.getEnable());
 		musicSheetCategory.setCoverImg(sysMusicScoreCategory.getCoverImg());
+		musicSheetCategory.setMusicSheetNum(sysMusicScoreCategory.getMusicScoreNum());
 		List<SysMusicScoreCategories> sysMusicScoreCategoriesList = sysMusicScoreCategory.getSysMusicScoreCategoriesList();
 		if(CollectionUtils.isNotEmpty(sysMusicScoreCategoriesList)){
 			List<MusicSheetCategoriesWrapper.MusicSheetCategories> categoriesList = sysMusicScoreCategoriesList.stream()
@@ -154,6 +178,7 @@ public class CbsMusicScoreCategoriesServiceImpl implements CbsMusicScoreCategori
 		sysMusicScoreCategory.setParentId(musicSheetCategory.getParentId().intValue());
 		sysMusicScoreCategory.setEnable(musicSheetCategory.getEnable());
 		sysMusicScoreCategory.setCoverImg(musicSheetCategory.getCoverImg());
+		sysMusicScoreCategory.setMusicScoreNum(musicSheetCategory.getMusicSheetNum());
 		List<MusicSheetCategoriesWrapper.MusicSheetCategories> categoriesList = musicSheetCategory.getMusicSheetCategoriesList();
 		if(CollectionUtils.isNotEmpty(categoriesList)){
 			List<SysMusicScoreCategories> sysMusicScoreCategoriesList = categoriesList.stream()

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -161,14 +161,12 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             List<String> cbsMusicSheetIds = records.stream().map(SysMusicScore::getCbsMusicSheetId).collect(Collectors.toList());
             List<CbsMusicSheetWrapper.MusicSheetApplication> applications = this.queryCbsMusicSheetApplication(cbsMusicSheetIds);
             if(CollectionUtils.isNotEmpty(applications)){
-                Set<Integer> categoriesIds = records.stream().map(SysMusicScore::getMusicScoreCategoriesId).collect(Collectors.toSet());
+                List<Integer> categoriesIds = records.stream().map(SysMusicScore::getCbsMusicCategoriesId).distinct().filter(Objects::nonNull).collect(Collectors.toList());
                 //获取分部列表
 //                Map<Integer, String> organMap = MapUtil.convertMybatisMap(sysMusicScoreCategoriesDao.queryOrganByIds(categoriesIds));
-                Map<Integer, String> map = new HashMap<>(categoriesIds.size());
-                for (Integer categoriesId : categoriesIds) {
-                    if(null != categoriesId){
-                        map.put(categoriesId, getParentTreeName(categoriesId));
-                    }
+                Map<Integer, String> map = new HashMap<>();
+                if(CollectionUtils.isNotEmpty(categoriesIds)){
+                    map = cbsMusicScoreCategoriesService.getCategoriesNameMap(categoriesIds);
                 }
                 Map<Long, CbsMusicSheetWrapper.MusicSheetApplication> musicSheetApplicationMap = applications
                         .stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, Function.identity()));
@@ -183,21 +181,21 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                     musicalInstrumentQueryMap = musicalInstrumentQueryDtos.stream().collect(Collectors.toMap(CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto::getId, o -> o, (o1, o2) -> o1));
                 }
                 //获取分类名称
-                Map<Integer, String> categoriesMap = new HashMap<>(categoriesIds.size());
+                /*Map<Integer, String> categoriesMap = new HashMap<>(categoriesIds.size());
                 for (Integer categoriesId : categoriesIds) {
                     if(null != categoriesId){
                         categoriesMap.put(categoriesId, getParentTreeName(categoriesId));
                     }
-                }
+                }*/
                 //获取声部乐器关联
                 List<Instrument> list = instrumentService.lambdaQuery().list();
                 Map<Integer, Instrument> instrumentMap = list.stream().collect(Collectors.toMap(Instrument::getSubjectId, o -> o));
                 for (SysMusicScore record : records) {
-                    record.setCategoriesName(map.get(record.getMusicScoreCategoriesId()));
+                    record.setCategoriesName(map.get(record.getCbsMusicCategoriesId()));
 //                    record.setOrganName(organMap.get(record.getMusicScoreCategoriesId()));
                     CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = musicSheetApplicationMap.get(Long.parseLong(record.getCbsMusicSheetId()));
                     if(musicSheetApplication != null){
-                        this.initMusicSheetVo(record,musicSheetApplication,musicalInstrumentQueryMap,categoriesMap,instrumentMap);
+                        this.initMusicSheetVo(record,musicSheetApplication,musicalInstrumentQueryMap,instrumentMap);
                     }
                 }
             }
@@ -206,20 +204,20 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 
     public void initMusicSheetVo(SysMusicScore record,CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication
             ,Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap,
-                                 Map<Integer, String> categoriesMap,Map<Integer, Instrument> instrumentMap){
+                                 Map<Integer, Instrument> instrumentMap){
         record.setRankIds(StringUtils.equals("FREE",musicSheetApplication.getPaymentType()) ? "" : "1");
         record.setCbsMusicSheetId(musicSheetApplication.getId().toString());
         record.setPlayMode(SysMusicScore.PlayMode.valueOf(musicSheetApplication.getPlayMode().getCode()));
         record.setExtConfigJson(musicSheetApplication.getExtConfigJson());
         record.setExtStyleConfigJson(musicSheetApplication.getExtStyleConfigJson());
-        if(musicSheetApplication.getMusicSheetCategoryId() != null){
-            record.setMusicScoreCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
-            record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
-        }
+//        if(musicSheetApplication.getMusicSheetCategoryId() != null){
+//            record.setMusicScoreCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
+//            record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
+//        }
         record.setName(musicSheetApplication.getName());
-        if(musicSheetApplication.getMusicSheetCategoryId() != null){
-            record.setCategoriesName(categoriesMap.get(musicSheetApplication.getMusicSheetCategoryId().intValue()));
-        }
+//        if(musicSheetApplication.getMusicSheetCategoryId() != null){
+//            record.setCategoriesName(categoriesMap.get(musicSheetApplication.getMusicSheetCategoryId().intValue()));
+//        }
         record.setSpeed(musicSheetApplication.getPlaySpeed());
         record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
@@ -291,17 +289,6 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
     private void initCategoryIds(SysExamSongQueryInfo queryInfo){
         if(StringUtils.isNotEmpty(queryInfo.getCategoriesId())){
             List<Integer> categoriesIdList = cbsMusicScoreCategoriesService.getAllCategoryIdList(queryInfo.getCategoriesId());
-            /*Integer categoriesId = Integer.parseInt(queryInfo.getCategoriesId());
-
-            SysMusicScoreCategories sysMusicScoreCategories = sysMusicScoreCategoriesService.get(categoriesId);
-
-            if(sysMusicScoreCategories == null){
-                throw new BizException("分类找不到");
-            }
-            categoriesIdList.add(categoriesId);
-            sysMusicScoreCategories = sysMusicScoreCategoriesService.getChildTree(sysMusicScoreCategories);
-            getAllCategoryIdList(categoriesIdList, sysMusicScoreCategories.getSysMusicScoreCategoriesList());*/
-
             queryInfo.setCategoriesIdList(categoriesIdList);
         }
     }
@@ -491,7 +478,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             }
         }
         if(addMusicSheet.getMusicSheetType() == null){
-            if(Arrays.stream(prodCategoryIds.split(",")).anyMatch(e->e.equals(from.getMusicScoreCategoriesId().toString()))){
+            if(Arrays.stream(prodCategoryIds.split(",")).anyMatch(e->e.equals(from.getCbsMusicCategoriesId().toString()))){
                 addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
             }else {
                 addMusicSheet.setMusicSheetType(EMusicSheetType.SINGLE);
@@ -571,8 +558,8 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         addMusicSheetApplicationExtend.setSortNo(from.getOrder());
         addMusicSheetApplicationExtend.setPaymentType(StringUtils.isNotEmpty(from.getRankIds()) ? "VIP" : "FREE");
         addMusicSheetApplicationExtend.setAvailableType(EMusicAvailableType.ORG);
-        addMusicSheetApplicationExtend.setMusicSheetCategoryId(from.getMusicScoreCategoriesId().longValue());
-        addMusicSheet.setMusicCategoryId(from.getMusicScoreCategoriesId().longValue());
+        addMusicSheetApplicationExtend.setMusicSheetCategoryId(from.getCbsMusicCategoriesId().longValue());
+        addMusicSheet.setMusicCategoryId(from.getCbsMusicCategoriesId().longValue());
         addMusicSheet.setAddMusicSheetApplicationExtend(Lists.newArrayList(addMusicSheetApplicationExtend));
         addMusicSheet.setIsConvertibleScore(true);
         return addMusicSheet;

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

@@ -46,10 +46,9 @@
 	<select id="get" resultMap="SysMusicScoreAccompaniment" >
 		SELECT sesa.id_,sesa.exam_song_id_,sesa.subject_id_,CASE WHEN sesa.metronome_mp3_url_ IS NULL OR sesa.metronome_mp3_url_ = '' THEN sesa.mp3_url_ ELSE sesa.metronome_mp3_url_ END url_,sesa.speed_,
 		sesa.xml_url_,sesa.is_show_fingering_,sesa.is_open_metronome_,sesa.memo_,sesa.track_,
-		ses.name_,ses.type_,ses.url_ mp3_url_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_,ses.metronome_url_,ses.midi_url_,ses.cbs_music_sheet_id_
+		ses.name_,ses.type_,ses.url_ mp3_url_,ses.cbs_music_categories_id_ categories_id_,ses.client_type_,ses.metronome_url_,ses.midi_url_,ses.cbs_music_sheet_id_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
-		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		WHERE sesa.id_ = #{id}
 	</select>
 	
@@ -100,11 +99,10 @@
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
 		SELECT
 		    ses.name_,ses.type_,ses.url_,ses.id_ exam_song_id_,
-		       sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
+		       ses.cbs_music_categories_id_ categories_id_,ses.client_type_,
 		ses.rank_ids_,ses.render_from_,ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,
 		ses.ext_config_json_,ses.ext_style_config_json_,ses.cbs_music_sheet_id_
 		FROM sys_music_score ses
-		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 		ORDER BY ses.order_,ses.name_
 		<include refid="global.limit"/>
@@ -114,7 +112,6 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(ses.id_)
 		FROM sys_music_score ses
-		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 	</select>
 
@@ -134,12 +131,10 @@
 		</where>
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
-		SELECT ses.id_ exam_song_id_,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_,
-		       sesc.parent_id_ parent_categories_id_,ses.client_type_,
+		SELECT ses.id_ exam_song_id_,ses.name_,ses.type_,ses.url_,ses.cbs_music_categories_id_ categories_id_,ses.client_type_,
 		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_,
 		ses.ext_style_config_json_,ses.rank_ids_,ses.cbs_music_sheet_id_
 		FROM sys_music_score ses
-		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 		ORDER BY ses.order_,ses.name_
 	</select>
@@ -147,16 +142,14 @@
 	<select id="findAccCount" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT ses.id_)
 		FROM sys_music_score ses
-		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 	</select>
     <select id="querySubjectIds" resultMap="com.ym.mec.biz.dal.dao.SubjectDao.Subject">
 		SELECT s.* FROM sys_music_score sms
 		LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,sms.subject_ids_)
-		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = sms.music_score_categories_id_
 		WHERE sms.del_flag_ = 0 AND sms.cbs_music_sheet_id_ IS NOT NULL AND s.id_ IS NOT NULL AND sms.music_sheet_type_ = 'SINGLE'
 		<if test="categoriesIdList != null and categoriesIdList.size > 0">
-			AND sesc.id_ IN
+			AND ses.cbs_music_categories_id_ IN
 			<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">
 				#{item}
 			</foreach>
@@ -170,12 +163,6 @@
     <sql id="queryPageSql">
 		<where>
 			ses.del_flag_ = 0
-			<if test="enable != null">
-				AND sesc.enable_ = #{enable}
-			</if>
-			<if test="parentId != null">
-				AND sesc.parent_id_ = #{parentId}
-			</if>
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
@@ -186,19 +173,16 @@
 				AND ses.show_flag_ = #{showFlag}
 			</if>
 			<if test="categoriesIdList != null">
-				AND sesc.id_ IN
+				AND ses.cbs_music_categories_id_ IN
 				<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">
 					#{item}
 				</foreach>
 			</if>
 			<if test="filterCategoriesIds != null and filterCategoriesIds != ''">
-				AND find_in_set(sesc.id_,#{filterCategoriesIds}) = 0
+				AND find_in_set(ses.cbs_music_categories_id_,#{filterCategoriesIds}) = 0
 			</if>
 			<if test="categoriesIds != null and categoriesIds != ''">
-				AND find_in_set(sesc.id_,#{categoriesIds}) > 0
-			</if>
-			<if test="parentId != null">
-				AND sesc.parent_id_ = #{parentId}
+				AND find_in_set(ses.cbs_music_categories_id_,#{categoriesIds}) > 0
 			</if>
 			<if test="subjectId != null">
 				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.is_all_subject_)

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

@@ -10,8 +10,9 @@
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
 		<result column="categories_name_" property="categoriesName" />
-		<result column="music_score_categories_id_" property="musicScoreCategoriesId" />
-		<result column="categories_id_" property="categoriesId" />
+		<result column="cbs_music_categories_id_" property="musicScoreCategoriesId" />
+		<result column="cbs_music_categories_id_" property="cbsMusicCategoriesId" />
+		<result column="cbs_music_categories_id_" property="categoriesId" />
 		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="subject_ids_" property="subjectIds" />
 		<result column="speed_" property="speed" />
@@ -52,7 +53,7 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,metronome_url_,midi_url_,create_user_id_,order_,
+		INSERT INTO sys_music_score (cbs_music_categories_id_,name_,type_,speed_,url_,metronome_url_,midi_url_,create_user_id_,order_,
 		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,enable_evaluation_,show_flag_,play_mode_,muse_score_url_,muse_score_memo_,ext_config_json_,ext_style_config_json_)
 		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{speed},#{url},#{metronomeUrl},#{midiUrl},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -87,7 +88,7 @@
 				del_flag_ = #{delFlag},
 			</if>
 			<if test="musicScoreCategoriesId != null">
-				music_score_categories_id_ = #{musicScoreCategoriesId},
+				cbs_music_categories_id_ = #{musicScoreCategoriesId},
 			</if>
 			<if test="createUserId != null">
 				create_user_id_ = #{createUserId},
@@ -130,38 +131,35 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysMusicScore">
-		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_
+		SELECT ses.*,su.real_name_ create_user_name_,ses.cbs_music_categories_id_ categories_id_
 		FROM sys_music_score ses
 		LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_
-		LEFT JOIN sys_music_score_categories smsc ON smsc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 		GROUP BY ses.id_
-		ORDER BY ses.music_score_categories_id_ DESC,ses.order_ ASC,ses.create_time_ DESC,ses.id_ desc
+		ORDER BY ses.cbs_music_categories_id_ DESC,ses.order_ ASC,ses.create_time_ DESC,ses.id_ desc
 	</select>
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScore" parameterType="map">
-		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_,ses.subject_ids_
+		SELECT ses.*,su.real_name_ create_user_name_,ses.cbs_music_categories_id_ categories_id_,ses.subject_ids_
 		FROM sys_music_score ses
 		LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_
-		LEFT JOIN sys_music_score_categories smsc ON smsc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 		GROUP BY ses.id_
-		ORDER BY ses.music_score_categories_id_ DESC,ses.order_ ASC,ses.create_time_ DESC,ses.id_ desc
+		ORDER BY ses.cbs_music_categories_id_ DESC,ses.order_ ASC,ses.create_time_ DESC,ses.id_ desc
 		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(DISTINCT ses.id_) FROM sys_music_score ses
-		LEFT JOIN sys_music_score_categories smsc ON smsc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 	</select>
     <select id="findByIds" resultMap="SysMusicScore">
 		SELECT * FROM sys_music_score WHERE FIND_IN_SET(id_,#{musicScoreIds})
 	</select>
     <select id="countBuyCategoriesIds" resultType="java.lang.Integer">
-		SELECT COUNT(0) FROM sys_music_score WHERE FIND_IN_SET(music_score_categories_id_,#{categoriesIds}) AND del_flag_ = 0
+		SELECT COUNT(0) FROM sys_music_score WHERE FIND_IN_SET(cbs_music_categories_id_,#{categoriesIds}) AND del_flag_ = 0
 	</select>
 	<select id="findByCbsId" resultMap="SysMusicScore">
 		SELECT * FROM sys_music_score WHERE 1 = 1
@@ -184,7 +182,7 @@
 
 	<update id="updateBatchByCbsId">
 		<foreach collection="vos" item="item" index="index" separator=";">
-			update sys_music_score set music_score_categories_id_ = #{item.musicSheetCategoryId},
+			update sys_music_score set cbs_music_categories_id_ = #{item.musicSheetCategoryId},
 			client_type_ = 'SMART_PRACTICE',type_ = 'COMMON',
 			rank_ids_ = CASE WHEN #{item.paymentType} = 'FREE' THEN NULL ELSE '1' END,
 			order_ = #{item.sortNo},del_flag_ = 0,show_flag_ = #{item.status},
@@ -224,7 +222,7 @@
 
 	<insert id="batchInsert">
 		insert into sys_music_score
-		(music_score_categories_id_,client_type_,type_,rank_ids_,order_
+		(cbs_music_categories_id_,client_type_,type_,rank_ids_,order_
 		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,cbs_music_sheet_id_,music_sheet_type_,
 		score_type_,is_convertible_score_,is_all_subject_)
 		values
@@ -255,7 +253,7 @@
 		<where>
 			ses.del_flag_ = 0 AND ses.cbs_music_sheet_id_ IS NOT NULL
 			<if test="categoriesIdList != null">
-				AND smsc.id_ IN
+				AND ses.cbs_music_categories_id_ IN
 				<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">
 					#{item}
 				</foreach>