yonge 3 år sedan
förälder
incheckning
fbc8b2d239

+ 21 - 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;
 
 /**
@@ -68,6 +69,10 @@ public class SysMusicScoreAccompaniment {
 	private String rankIds;
 
 	private ClientTypeEnum clientType;
+	
+	private String renderFrom;
+	
+	private boolean enableEvaluation;
 
 	public String getMetronomeUrl() {
 		return metronomeUrl;
@@ -245,6 +250,22 @@ public class SysMusicScoreAccompaniment {
 		this.isOpenMetronome = isOpenMetronome;
 	}
 
+	public String getRenderFrom() {
+		return renderFrom;
+	}
+
+	public void setRenderFrom(String renderFrom) {
+		this.renderFrom = renderFrom;
+	}
+
+	public boolean isEnableEvaluation() {
+		return enableEvaluation;
+	}
+
+	public void setEnableEvaluation(boolean enableEvaluation) {
+		this.enableEvaluation = enableEvaluation;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -28,6 +28,8 @@
 		<result column="is_open_metronome_" property="isOpenMetronome" />
 		<result column="memo_" property="memo" />
 		<result column="rank_ids_" property="rankIds" />
+		<result column="render_from_" property="renderFrom" />
+		<result column="enable_evaluation_" property="enableEvaluation" />
 		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 
@@ -125,7 +127,7 @@
 	
 	<!-- 分页查询 -->
 	<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_
+		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_
 		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_