yonge 3 vuotta sitten
vanhempi
commit
19138c803f

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

@@ -62,8 +62,6 @@ public class SysMusicScore {
 
 	//是否显示
 	private Integer showFlag = 0;
-	
-	private Boolean isOpenMetronome;
 
 	public Integer getShowFlag() {
 		return showFlag;
@@ -208,14 +206,6 @@ public class SysMusicScore {
 	public java.util.Date getCreateTime(){
 		return this.createTime;
 	}
-			
-	public Boolean getIsOpenMetronome() {
-		return isOpenMetronome;
-	}
-
-	public void setIsOpenMetronome(Boolean isOpenMetronome) {
-		this.isOpenMetronome = isOpenMetronome;
-	}
 
 	@Override
 	public String toString() {

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -55,6 +56,8 @@ public class SysMusicScoreAccompaniment {
 
 	//是否显示指法
 	private Boolean isShowFingering = true;
+	
+	private Boolean isOpenMetronome;
 
 	private String memo;
 
@@ -214,6 +217,14 @@ public class SysMusicScoreAccompaniment {
 		return this.updateTime;
 	}
 			
+	public Boolean getIsOpenMetronome() {
+		return isOpenMetronome;
+	}
+
+	public void setIsOpenMetronome(Boolean isOpenMetronome) {
+		this.isOpenMetronome = isOpenMetronome;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -23,6 +23,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="is_show_fingering_" property="isShowFingering" />
+		<result column="is_open_metronome_" property="isOpenMetronome" />
 		<result column="memo_" property="memo" />
 		<result column="rank_ids_" property="rankIds" />
 		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -48,16 +49,16 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,create_time_,update_time_)
-		VALUES(#{examSongId},#{subjectId},#{mp3Url},#{speed},#{xmlUrl},NOW(),NOW())
+		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,create_time_,update_time_,is_open_metronome_)
+		VALUES(#{examSongId},#{subjectId},#{mp3Url},#{speed},#{xmlUrl},NOW(),NOW(),#{isOpenMetronome})
 	</insert>
     <insert id="batchInsert">
 		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,
-		                                           create_time_,update_time_,is_show_fingering_,memo_)
+		                                           create_time_,update_time_,is_show_fingering_,memo_,is_open_metronome_)
 		VALUES
 		<foreach collection="sysMusicScoreAccompaniments" item="item"  separator=",">
 			(#{sysMusicScoreId},#{item.subjectId},#{item.mp3Url},#{item.speed},
-			 #{item.xmlUrl},NOW(),NOW(),#{item.isShowFingering},#{item.memo})
+			 #{item.xmlUrl},NOW(),NOW(),#{item.isShowFingering},#{item.memo},#{item.isOpenMetronome})
 		</foreach>
 	</insert>
 
@@ -68,6 +69,9 @@
 		<if test="isShowFingering != null">
 			is_show_fingering_ = #{isShowFingering},
 		</if>
+		<if test="isOpenMetronome != null">
+			is_open_metronome_ = #{isOpenMetronome},
+		</if>
 		<if test="memo != null">
 			memo_ = #{memo},
 		</if>
@@ -93,6 +97,9 @@
 				<if test="item.isShowFingering != null">
 					is_show_fingering_ = #{item.isShowFingering},
 				</if>
+				<if test="item.isOpenMetronome != null">
+					is_open_metronome_ = #{item.isOpenMetronome},
+				</if>
 				<if test="item.memo != null">
 					memo_ = #{item.memo},
 				</if>

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

@@ -21,7 +21,6 @@
 		<result column="show_flag_" property="showFlag" />
 		<result column="order_" property="order" />
 		<result column="rank_ids_" property="rankIds" />
-		<result column="is_open_metronome_" property="isOpenMetronome" />
 		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
@@ -39,9 +38,9 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<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_,create_user_id_,order_,update_time_,create_time_,client_type_,rank_ids_,show_flag_,is_open_metronome_)
+		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,order_,update_time_,create_time_,client_type_,rank_ids_,show_flag_)
 		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		       #{speed},#{url},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rankIds},#{showFlag},#{isOpenMetronome})
+		       #{speed},#{url},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rankIds},#{showFlag})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -79,9 +78,6 @@
 		<if test="speed != null">
 			speed_ = #{speed},
 		</if>
-		<if test="isOpenMetronome != null">
-			is_open_metronome_ = #{isOpenMetronome},
-		</if>
 			update_time_ = NOW()
 	</set>
 		WHERE id_ = #{id}