zouxuan há 4 anos atrás
pai
commit
9bfd0495fc

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

@@ -19,6 +19,9 @@ public class SysMusicScore {
 
 	/** 名称 */
 	private String categoriesName;
+
+	/** 名称 */
+	private Integer categoriesId;
 	
 	/** 类型PERSON 个人,COMMON公用 */
 	private ExamSongTypeEnum type;
@@ -47,6 +50,14 @@ public class SysMusicScore {
 	/**  */
 	private java.util.Date createTime;
 
+	public Integer getCategoriesId() {
+		return categoriesId;
+	}
+
+	public void setCategoriesId(Integer categoriesId) {
+		this.categoriesId = categoriesId;
+	}
+
 	public String getCategoriesName() {
 		return categoriesName;
 	}

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

@@ -38,6 +38,9 @@ public class SysMusicScoreAccompaniment {
 	private String categoriesName;
 
 	/**  */
+	private Integer categoriesId;
+
+	/**  */
 	private String type;
 
 	/**  */
@@ -49,6 +52,14 @@ public class SysMusicScoreAccompaniment {
 	/**  */
 	private java.util.Date updateTime;
 
+	public Integer getCategoriesId() {
+		return categoriesId;
+	}
+
+	public void setCategoriesId(Integer categoriesId) {
+		this.categoriesId = categoriesId;
+	}
+
 	public String getCategoriesName() {
 		return categoriesName;
 	}

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

@@ -15,6 +15,7 @@
 		<result column="xml_url_" property="xmlUrl" />
 		<result column="name_" property="examSongName" />
 		<result column="categories_name_" property="categoriesName" />
+		<result column="categories_id_" property="categoriesId" />
 		<result column="type_" property="type" />
 		<result column="url_" property="url" />
 		<result column="del_flag_" property="delFlag" />
@@ -29,7 +30,7 @@
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScoreAccompaniment" >
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_
 		FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
@@ -113,7 +114,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
-		SELECT sesa.*,s.name_ subject_name_,sesc.name_ categories_name_
+		SELECT sesa.*,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_
 		FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
@@ -151,7 +152,7 @@
 		</where>
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_
 		FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_

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

@@ -10,6 +10,7 @@
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
 		<result column="categories_name_" property="categoriesName" />
+		<result column="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" />
@@ -75,7 +76,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScore" parameterType="map">
-		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_
+		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,sesc.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_