Merge remote-tracking branch 'origin/master'

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

@@ -43,7 +43,7 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
 	 * @param status
 	 * @return
 	 */
-	List<MusicGroupPaymentCalender> queryByPaymentStatus(List<PaymentStatusEnum> status);
+	List<MusicGroupPaymentCalender> queryByPaymentStatus(@Param("status") List<PaymentStatusEnum> status);
 	
 	/**
 	 * 获取缴费信息锁

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

@@ -165,8 +165,8 @@
 		LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
 		<where>
 			mgpc.music_group_id_ = sr.music_group_id_
-			<if test="userId != null">
-				AND mgpcd.user_id_ = #{userId}
+			<if test="search != null and search != ''">
+				AND (mgpcd.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="id != null">
 				AND mgpcd.music_group_payment_calender_id_ = #{id}
@@ -187,9 +187,10 @@
 		SELECT COUNT(DISTINCT mgpcd.id_) FROM music_group_payment_calender_detail mgpcd
 		LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_
 		LEFT JOIN `subject` st ON st.id_ = sr.actual_subject_id_
+		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
 		<where>
-			<if test="userId != null">
-				AND mgpcd.user_id_ = #{userId}
+			<if test="search != null and search != ''">
+				AND (mgpcd.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="id != null">
 				AND mgpcd.music_group_payment_calender_id_ = #{id}
@@ -226,7 +227,7 @@
 		SELECT * FROM music_group_payment_calender_detail mgpcd
 		LEFT JOIN music_group_payment_calender mgpc ON mgpcd.music_group_payment_calender_id_ = mgpc.id_
 		WHERE mgpc.music_group_id_=#{musicGroupId} AND mgpcd.user_id_=#{userId} AND mgpcd.payment_status_ = 'NON_PAYMENT'
-		AND mgpc.payment_status_ = '1' OR mgpcd.open_=1
+		AND (mgpc.payment_status_ = '1' OR mgpcd.open_=1)
 		ORDER BY mgpc.start_payment_date_ DESC LIMIT 1
 	</select>
 	<select id="queryCanOpenList" resultMap="MusicGroupPaymentCalenderDetail">

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

@@ -159,7 +159,7 @@
         <where>
         	<if test="status != null">
         		payment_status_ in
-        		<foreach collection="list" item="item" open="(" close=")" separator=",">
+        		<foreach collection="status" item="item" open="(" close=")" separator=",">
 		            #{item}
 		        </foreach>
         	</if>

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

@@ -231,14 +231,49 @@
 
     <update id="batchUpdate" parameterType="java.util.List">
     	<foreach collection="list" item="item" index="index" open="" close="" separator=";">
-        UPDATE music_group_student_fee_
-        SET update_time_ = NOW(),payment_period_list_ = #{item.paymentPeriodList},
-            next_payment_date_ = #{item.nextPaymentDate},subject_id_ = #{item.subjectId},
-            course_fee_ = #{item.courseFee},latest_paid_time_ = #{item.latestPaidTime},
-            continuous_absenteeism_times_ = #{item.continuousAbsenteeismTimes},
-            payment_status_ = #{item.paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            temporary_course_fee_ = #{item.temporaryCourseFee}
-        WHERE id_ = #{item.id}
+	        UPDATE music_group_student_fee_
+	        <set>
+	            <if test="item.userId != null">
+	                user_id_ = #{item.userId},
+	            </if>
+	            <if test="item.subjectId != null">
+	                subject_id_ = #{item.subjectId},
+	            </if>
+	            <if test="item.updateTime != null">
+	                update_time_ = NOW(),
+	            </if>
+	            <if test="item.courseFee != null">
+	                course_fee_ = #{item.courseFee},
+	            </if>
+	            <if test="item.musicGroupId != null">
+	                music_group_id_ = #{item.musicGroupId},
+	            </if>
+	            <if test="item.nextPaymentDate != null">
+	                next_payment_date_ = #{item.nextPaymentDate},
+	            </if>
+	            <if test="item.latestPaidTime != null">
+	                latest_paid_time_ = #{item.latestPaidTime},
+	            </if>
+	            <if test="item.continuousAbsenteeismTimes != null">
+	                continuous_absenteeism_times_ = #{item.continuousAbsenteeismTimes},
+	            </if>
+	            <if test="item.paymentStatus != null">
+	                payment_status_ = #{item.paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+	            </if>
+	            <if test="item.temporaryCourseFee != null">
+	                temporary_course_fee_ = #{item.temporaryCourseFee},
+	            </if>
+	            <if test="item.remainNetworkClassTimes != null">
+	                remain_network_class_times_ = #{item.remainNetworkClassTimes},
+	            </if>
+	            <if test="item.isLock != null">
+	                is_lock_ = #{item.isLock},
+	            </if>
+	            <if test="item.paymentPeriodList != null">
+	                payment_period_list_ = #{item.paymentPeriodList},
+	            </if>
+	        </set>
+	        WHERE id_ = #{item.id}
         </foreach>
     </update>
     <update id="updateCourseFee">