Merge remote-tracking branch 'origin/online1' into online1

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

@@ -52,6 +52,27 @@ public class SysMusicScoreAccompaniment {
 	/**  */
 	private java.util.Date updateTime;
 
+	//是否显示指法
+	private Boolean isShowFingering = true;
+
+	private String memo;
+
+	public Boolean getIsShowFingering() {
+		return isShowFingering;
+	}
+
+	public void setIsShowFingering(Boolean showFingering) {
+		isShowFingering = showFingering;
+	}
+
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+
 	public Integer getCategoriesId() {
 		return categoriesId;
 	}

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

@@ -21,6 +21,16 @@ public class SysExamSongQueryInfo extends QueryInfo {
 
     private Integer parentId;
 
+    private Boolean isShowFingering;
+
+    public Boolean getIsShowFingering() {
+        return isShowFingering;
+    }
+
+    public void setIsShowFingering(Boolean showFingering) {
+        isShowFingering = showFingering;
+    }
+
     public Integer getParentId() {
         return parentId;
     }

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

@@ -44,6 +44,12 @@ public class TeacherSalaryModifyLogServiceImpl extends BaseServiceImpl<Long, Tea
 		if(modifyLog.getCurrentExpectSalary().compareTo(modifyLog.getCurrentReduceSalary()) < 0){
 			throw new BizException("应发金额不应小于扣款金额");
 		}
+		if(salary.getExpectSalary() == null){
+			salary.setExpectSalary(BigDecimal.ZERO);
+		}
+		if(salary.getReduceSalary() == null){
+			salary.setReduceSalary(BigDecimal.ZERO);
+		}
 		modifyLog.setPreExpectSalary(salary.getExpectSalary());
 		modifyLog.setPreReduceSalary(salary.getReduceSalary());
 		modifyLog.setOperatorId(sysUser.getId());

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

@@ -22,6 +22,8 @@
 		<result column="speed_" property="speed" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="is_show_fingering_" property="isShowFingering" />
+		<result column="memo_" property="memo" />
 	</resultMap>
 
 	<delete id="deleteBySongId">
@@ -48,10 +50,10 @@
 		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_,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_,is_show_fingering_,memo_)
 		VALUES
 		<foreach collection="sysMusicScoreAccompaniments" item="item"  separator=",">
-			(#{sysMusicScoreId},#{item.subjectId},#{item.mp3Url},#{item.speed},#{item.xmlUrl},NOW(),NOW())
+			(#{sysMusicScoreId},#{item.subjectId},#{item.mp3Url},#{item.speed},#{item.xmlUrl},NOW(),NOW(),#{item.isShowFingering},#{item.memo})
 		</foreach>
 	</insert>
 
@@ -59,6 +61,12 @@
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment">
 		UPDATE sys_music_score_accompaniment
 		<set>
+		<if test="isShowFingering != null">
+			is_show_fingering_ = #{isShowFingering},
+		</if>
+		<if test="memo != null">
+			memo_ = #{memo},
+		</if>
 		<if test="subjectId != null">
 			subject_id_ = #{subjectId},
 		</if>
@@ -87,6 +95,12 @@
 		<foreach collection="sysMusicScoreAccompaniments" item="item" separator=";">
 			UPDATE sys_music_score_accompaniment
 			<set>
+				<if test="item.isShowFingering != null">
+					is_show_fingering_ = #{item.isShowFingering},
+				</if>
+				<if test="item.memo != null">
+					memo_ = #{item.memo},
+				</if>
 				<if test="item.speed != null">
 					speed_ = #{item.speed},
 				</if>
@@ -188,6 +202,9 @@
 			<if test="subjectId != null">
 				AND sesa.subject_id_ = #{subjectId}
 			</if>
+			<if test="isShowFingering != null">
+				AND sesa.is_show_fingering_ = #{isShowFingering}
+			</if>
 			<if test="type != null and type == 'COMMON'">
 				AND ses.type_ = #{type}
 			</if>