Merge branch 'musicScore' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMusicScoreAccompanimentDao.java

@@ -11,7 +11,8 @@ import java.util.Map;
 public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusicScoreAccompaniment> {
 
 
-    void batchInsert(@Param("sysMusicScoreAccompaniments") List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments, @Param("sysMusicScoreId") Integer sysMusicScoreId);
+    void batchInsert(@Param("sysMusicScoreAccompaniments") List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments,
+                     @Param("sysMusicScoreId") Integer sysMusicScoreId);
 
     void batchDel(List<Integer> delExamSongAccompanimentIds);
 

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -17,7 +18,7 @@ public class SysMusicScore {
 	private String name;
 	
 	/** 类型PERSON 个人,COMMON公用 */
-	private String type;
+	private ExamSongTypeEnum type;
 	
 	/** 声部列表 */
 	private String subjectIds;
@@ -74,15 +75,15 @@ public class SysMusicScore {
 	public String getName(){
 		return this.name;
 	}
-			
-	public void setType(String type){
-		this.type = type;
+
+	public ExamSongTypeEnum getType() {
+		return type;
 	}
-	
-	public String getType(){
-		return this.type;
+
+	public void setType(ExamSongTypeEnum type) {
+		this.type = type;
 	}
-			
+
 	public void setSubjectIds(String subjectIds){
 		this.subjectIds = subjectIds;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SysExamSongQueryInfo.java

@@ -14,6 +14,16 @@ public class SysExamSongQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "类型",required = true)
     private String type;
 
+    private Integer sysMusicScoreId;
+
+    public Integer getSysMusicScoreId() {
+        return sysMusicScoreId;
+    }
+
+    public void setSysMusicScoreId(Integer sysMusicScoreId) {
+        this.sysMusicScoreId = sysMusicScoreId;
+    }
+
     public Integer getCreateUserId() {
         return createUserId;
     }

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

@@ -21,8 +21,9 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
-	<delete id="deleteBySongId">
 
+	<delete id="deleteBySongId">
+		UPDATE sys_music_score_accompaniment SET del_flag_ = 1,update_time_ = NOW() WHERE exam_song_id_ = #{id}
 	</delete>
 
 	<!-- 根据主键查询一条记录 -->
@@ -40,14 +41,14 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<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_,del_flag_,speed_,xml_url_,create_time_,update_time_)
-		VALUES(#{examSongId},#{subjectId},#{mp3Url},#{delFlag},#{speed},#{xmlUrl},NOW(),NOW())
+		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>
     <insert id="batchInsert">
-		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,del_flag_,speed_,xml_url_,create_time_,update_time_)
+		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,create_time_,update_time_)
 		VALUES
-		<foreach collection="sysExamSongAccompaniments" item="item"  separator=",">
-			(#{item.examSongId},#{item.subjectId},#{item.mp3Url},#{item.delFlag},#{item.speed},#{item.xmlUrl},NOW(),NOW())
+		<foreach collection="sysMusicScoreAccompaniments" item="item"  separator=",">
+			(#{sysMusicScoreId},#{item.subjectId},#{item.mp3Url},#{item.speed},#{item.xmlUrl},NOW(),NOW())
 		</foreach>
 	</insert>
 
@@ -80,7 +81,7 @@
 		</foreach>
 	</update>
 	<update id="batchUpdate">
-		<foreach collection="sysExamSongAccompaniment" item="item" separator=";">
+		<foreach collection="sysMusicScoreAccompaniments" item="item" separator=";">
 			UPDATE sys_music_score_accompaniment
 			<set>
 				<if test="item.speed != null">
@@ -110,7 +111,20 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
-		SELECT * FROM sys_music_score_accompaniment ORDER BY id_ <include refid="global.limit"/>
+		SELECT sesa.*,s.name_ subject_name_
+		FROM sys_music_score_accompaniment sesa
+		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
+		<where>
+			sesa.del_flag_ = 0
+			<if test="subjectId != null">
+				AND sesa.subject_id_ = #{subjectId}
+			</if>
+			<if test="sysMusicScoreId != null">
+				AND sesa.exam_song_id_ = #{sysMusicScoreId}
+			</if>
+		</where>
+		ORDER BY sesa.id_ DESC
+		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->

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

@@ -32,8 +32,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<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_,del_flag_,update_time_,create_time_)
-		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{speed},#{url},#{createUserId},#{delFlag},NOW(),NOW())
+		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,update_time_,create_time_)
+		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{speed},#{url},#{createUserId},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->