Merge branch 'practice_1129'

# Conflicts:
#	mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml
#	mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml

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

@@ -66,6 +66,8 @@ public class SysMusicScore {
 
 	/** 带节拍器原音MP3 */
 	private String metronomeUrl;
+	
+	private String midiUrl;
 
 	private String accompanimentUrl;
 
@@ -176,6 +178,14 @@ public class SysMusicScore {
 		this.metronomeUrl = metronomeUrl;
 	}
 
+	public String getMidiUrl() {
+		return midiUrl;
+	}
+
+	public void setMidiUrl(String midiUrl) {
+		this.midiUrl = midiUrl;
+	}
+
 	public Integer getShowFlag() {
 		return showFlag;
 	}

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

@@ -56,6 +56,8 @@ public class SysMusicScoreAccompaniment {
 
 	/** 带节拍器MP3 */
 	private String metronomeUrl;
+
+	private String midiUrl;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -92,6 +94,14 @@ public class SysMusicScoreAccompaniment {
 		this.metronomeUrl = metronomeUrl;
 	}
 
+	public String getMidiUrl() {
+		return midiUrl;
+	}
+
+	public void setMidiUrl(String midiUrl) {
+		this.midiUrl = midiUrl;
+	}
+
 	public String getRankIds() {
 		return rankIds;
 	}

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

@@ -21,6 +21,7 @@
 		<result column="type_" property="type" />
 		<result column="url_" property="url" />
 		<result column="metronome_url_" property="metronomeUrl" />
+		<result column="midi_url_" property="midiUrl" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="speed_" property="speed" />
 		<result column="create_time_" property="createTime" />
@@ -43,7 +44,7 @@
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScoreAccompaniment" >
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_,ses.metronome_url_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_,ses.metronome_url_,ses.midi_url_
 		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_
@@ -131,8 +132,9 @@
 	
 	<!-- 分页查询 -->
 	<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.rank_ids_,ses.render_from_,
-		ses.enable_evaluation_,ses.metronome_url_,ses.muse_score_url_,ses.muse_score_memo_,ses.play_mode_
+		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.muse_score_url_,ses.muse_score_memo_,ses.play_mode_
 		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_
@@ -168,7 +170,7 @@
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
 		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.enable_evaluation_,ses.metronome_url_,ses.muse_score_url_,ses.muse_score_memo_,ses.play_mode_
+		ses.enable_evaluation_,ses.metronome_url_,ses.muse_score_url_,ses.muse_score_memo_,ses.play_mode_,ses.midi_url_
 		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_

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

@@ -17,6 +17,7 @@
 		<result column="speed_" property="speed" />
 		<result column="url_" property="url" />
 		<result column="metronome_url_" property="metronomeUrl" />
+		<result column="midi_url_" property="midiUrl" />
 		<result column="accompaniment_url_" property="accompanimentUrl" />
 		<result column="accompaniment_metronome_url_" property="accompanimentMetronomeUrl" />
 		<result column="create_user_id_" property="createUserId" />
@@ -50,10 +51,10 @@
 	<!-- 向数据库增加一条记录 -->
 	<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_,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_)
+		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,enable_evaluation_,show_flag_,play_mode_,muse_score_url_,muse_score_memo_,midi_url_)
 		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{speed},#{url},#{metronomeUrl},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		       #{rankIds},#{renderFrom},#{enableEvaluation},#{showFlag},#{playMode},#{museScoreUrl},#{museScoreMemo})
+		       #{rankIds},#{renderFrom},#{enableEvaluation},#{showFlag},#{playMode},#{museScoreUrl},#{museScoreMemo},#{midiUrl})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -84,7 +85,7 @@
 		<if test="createUserId != null">
 			create_user_id_ = #{createUserId},
 		</if>
-			metronome_url_ = #{metronomeUrl},
+			metronome_url_ = #{metronomeUrl},midi_url_ = #{midiUrl},
 			url_ = #{url},
 		<if test="subjectIds != null and subjectIds != ''">
 			subject_ids_ = #{subjectIds},