zouxuan 4 lat temu
rodzic
commit
ddd60507dc

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

@@ -16,6 +16,9 @@ public class SysMusicScore {
 	
 	/** 名称 */
 	private String name;
+
+	/** 名称 */
+	private String categoriesName;
 	
 	/** 类型PERSON 个人,COMMON公用 */
 	private ExamSongTypeEnum type;
@@ -44,6 +47,14 @@ public class SysMusicScore {
 	/**  */
 	private java.util.Date createTime;
 
+	public String getCategoriesName() {
+		return categoriesName;
+	}
+
+	public void setCategoriesName(String categoriesName) {
+		this.categoriesName = categoriesName;
+	}
+
 	public String getCreateUserName() {
 		return createUserName;
 	}

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

@@ -28,9 +28,10 @@
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScoreAccompaniment" >
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_
 		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_
 		WHERE sesa.id_ = #{id}
 	</select>
 	
@@ -111,8 +112,10 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
-		SELECT sesa.*,s.name_ subject_name_
+		SELECT sesa.*,s.name_ subject_name_,sesc.name_ categories_name_
 		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_
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
 		<where>
 			sesa.del_flag_ = 0
@@ -147,9 +150,10 @@
 		</where>
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_
 		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_
 		LEFT JOIN subject s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
 	</select>

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

@@ -9,6 +9,7 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.SysMusicScore" id="SysMusicScore">
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
+		<result column="categories_name_" property="categoriesName" />
 		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="subject_ids_" property="subjectIds" />
 		<result column="speed_" property="speed" />
@@ -74,9 +75,10 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScore" parameterType="map">
-		SELECT ses.*,su.real_name_ create_user_name_
+		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_
 		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_
 		<include refid="queryPageSql"/>
 		GROUP BY ses.id_
 		ORDER BY ses.id_ DESC