Merge branch 'zx_saas_cbs' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -96,7 +96,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 			List<SysMusicScoreAccompaniment> childAccompaniments = new ArrayList<>();
 			for (int i = 0; i < musicSheetApplication.getMusicSheetSoundList().size(); i++) {
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
-				record.setId(accompaniment.getId());
+//				record.setId(accompaniment.getId());
 				record.setType(accompaniment.getType());
 				record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
 				record.setClientType(accompaniment.getClientType());
@@ -104,7 +104,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 				record.setCbsMusicSheetId(musicSheetApplication.getId().toString());
 				record.setPlayMode(SysMusicScore.PlayMode.valueOf(musicSheetApplication.getPlayMode().getCode()));
 				record.setExtConfigJson(musicSheetApplication.getExtConfigJson());
-				record.setSubjectId(accompaniment.getSubjectId());
+//				record.setSubjectId(accompaniment.getSubjectId());
 				record.setExtStyleConfigJson(musicSheetApplication.getExtStyleConfigJson());
 				if(musicSheetApplication.getMusicSheetCategoryId() != null){
 					record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());

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

@@ -145,14 +145,12 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
 		SELECT
-		    sesa.*,ses.name_,ses.type_,ses.url_,
-		       s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
+		    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.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_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
-		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
 		ORDER BY ses.order_,ses.name_
 		<include refid="global.limit"/>
@@ -160,9 +158,8 @@
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(sesa.id_)
+		SELECT COUNT(ses.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_
 		<include refid="queryPageSql"/>
 	</select>
@@ -219,21 +216,18 @@
 
     <sql id="queryPageSql">
 		<where>
-			sesa.del_flag_ = 0 AND ses.del_flag_ = 0
+			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="organId != null and organId != ''">
-				AND INTE_ARRAY(#{organId},sesc.organ_id_)
-			</if> -->
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="sysMusicScoreId != null">
-				AND sesa.exam_song_id_ = #{sysMusicScoreId}
+				AND ses.id_ = #{sysMusicScoreId}
 			</if>
 			<if test="showFlag != null">
 				AND ses.show_flag_ = #{showFlag}