update

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

@@ -13,13 +13,15 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusic
 
 
     void batchInsert(@Param("sysMusicScoreAccompaniments") List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments,
-                     @Param("sysMusicScoreId") Integer sysMusicScoreId);
+                     @Param("sysMusicScoreId") Integer sysMusicScoreId,
+                     @Param("isOpenMetronome") Boolean isOpenMetronome);
 
     void batchDel(@Param("delExamSongAccompanimentIds") List<Integer> delExamSongAccompanimentIds);
 
     List<Integer> findSubjectByMusicScoreId(@Param("sysMusicScoreId") Integer sysMusicScoreId, @Param("idList") List<Integer> idList);
 
-    void batchUpdate(@Param("sysMusicScoreAccompaniments") List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments);
+    void batchUpdate(@Param("sysMusicScoreAccompaniments") List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments,
+                     @Param("isOpenMetronome") Boolean isOpenMetronome);
 
     void deleteBySongId(Integer id);
 

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

@@ -70,6 +70,16 @@ public class SysMusicScore {
 	//是否显示
 	private Integer showFlag = 0;
 
+	private Boolean isOpenMetronome;
+
+	public Boolean getIsOpenMetronome() {
+		return isOpenMetronome;
+	}
+
+	public void setIsOpenMetronome(Boolean isOpenMetronome) {
+		this.isOpenMetronome = isOpenMetronome;
+	}
+
 	public String getAccompanimentUrl() {
 		return accompanimentUrl;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -67,12 +67,12 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 			//获取需要修改的伴奏
 			List<SysMusicScoreAccompaniment> updateCollect = sysMusicScoreAccompaniments.stream().filter(e -> e.getId() != null).collect(Collectors.toList());
 			if(updateCollect.size() > 0){
-				sysMusicScoreAccompanimentDao.batchUpdate(updateCollect);
+				sysMusicScoreAccompanimentDao.batchUpdate(updateCollect,sysMusicScore.getIsOpenMetronome());
 			}
 			//获取需要新增的伴奏
 			List<SysMusicScoreAccompaniment> addCollect = sysMusicScoreAccompaniments.stream().filter(e -> e.getId() == null).collect(Collectors.toList());
 			if(addCollect.size() > 0){
-				sysMusicScoreAccompanimentDao.batchInsert(addCollect,sysMusicScore.getId());
+				sysMusicScoreAccompanimentDao.batchInsert(addCollect,sysMusicScore.getId(),sysMusicScore.getIsOpenMetronome());
 			}
 		}
 	}
@@ -89,7 +89,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 		sysMusicScoreDao.insert(sysMusicScore);
 		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = musicScoreDto.getSysMusicScoreAccompaniments();
 		if(sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0){
-			sysMusicScoreAccompanimentDao.batchInsert(sysMusicScoreAccompaniments,sysMusicScore.getId());
+			sysMusicScoreAccompanimentDao.batchInsert(sysMusicScoreAccompaniments,sysMusicScore.getId(),sysMusicScore.getIsOpenMetronome());
 		}
 		Integer categoriesId = sysMusicScore.getMusicScoreCategoriesId();
 		if(categoriesId != null && sysMusicScore.getClientType() == SMART_PRACTICE){

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

@@ -60,7 +60,7 @@
 		VALUES
 		<foreach collection="sysMusicScoreAccompaniments" item="item"  separator=",">
 			(#{sysMusicScoreId},#{item.subjectId},#{item.mp3Url},#{item.speed},
-			 #{item.xmlUrl},NOW(),NOW(),#{item.isShowFingering},#{item.memo},#{item.isOpenMetronome})
+			 #{item.xmlUrl},NOW(),NOW(),#{item.isShowFingering},#{item.memo},#{isOpenMetronome})
 		</foreach>
 	</insert>
 
@@ -100,8 +100,8 @@
 				<if test="item.isShowFingering != null">
 					is_show_fingering_ = #{item.isShowFingering},
 				</if>
-				<if test="item.isOpenMetronome != null">
-					is_open_metronome_ = #{item.isOpenMetronome},
+				<if test="isOpenMetronome != null">
+					is_open_metronome_ = #{isOpenMetronome},
 				</if>
 				<if test="item.memo != null">
 					memo_ = #{item.memo},

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

@@ -21,6 +21,7 @@
 		<result column="accompaniment_metronome_url_" property="accompanimentMetronomeUrl" />
 		<result column="create_user_id_" property="createUserId" />
 		<result column="create_user_name_" property="createUserName" />
+		<result column="is_open_metronome_" property="isOpenMetronome" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="show_flag_" property="showFlag" />
 		<result column="order_" property="order" />
@@ -97,7 +98,7 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScore" parameterType="map">
 		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_,
-		smsa.mp3_url_ accompaniment_url_,smsa.metronome_url_ accompaniment_metronome_url_
+		smsa.mp3_url_ accompaniment_url_,smsa.metronome_url_ accompaniment_metronome_url_,smsa.is_open_metronome_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment smsa ON smsa.exam_song_id_ = ses.id_
 		LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_