|  | @@ -219,41 +219,32 @@
 | 
	
		
			
				|  |  |      <!-- 分页查询 -->
 | 
	
		
			
				|  |  |      <select id="queryPage" resultMap="MusicGroupPaymentCalender" parameterType="map">
 | 
	
		
			
				|  |  |          SELECT * FROM music_group_payment_calender mgpc
 | 
	
		
			
				|  |  | -        <where>
 | 
	
		
			
				|  |  | -        	<if test="musicGroupId != null">
 | 
	
		
			
				|  |  | -        		and mgpc.music_group_id_ = #{musicGroupId}
 | 
	
		
			
				|  |  | -        	</if>
 | 
	
		
			
				|  |  | -        	<if test="payUserType != null">
 | 
	
		
			
				|  |  | -        		and mgpc.pay_user_type_ = #{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
	
		
			
				|  |  | -        	</if>
 | 
	
		
			
				|  |  | -        	<if test="paymentType != null">
 | 
	
		
			
				|  |  | -        		and mgpc.payment_type_ = #{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
	
		
			
				|  |  | -        	</if>
 | 
	
		
			
				|  |  | -        	<if test="status != null">
 | 
	
		
			
				|  |  | -        		and mgpc.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
	
		
			
				|  |  | -        	</if>
 | 
	
		
			
				|  |  | -        </where>
 | 
	
		
			
				|  |  | +        <include refid="queryPageSql"/>
 | 
	
		
			
				|  |  |          ORDER BY mgpc.payment_valid_start_date_ DESC
 | 
	
		
			
				|  |  |          <include refid="global.limit"/>
 | 
	
		
			
				|  |  |      </select>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    <!-- 查询当前表的总记录数 -->
 | 
	
		
			
				|  |  | -    <select id="queryCount" resultType="int">
 | 
	
		
			
				|  |  | -		SELECT COUNT(mgpc.id_) FROM music_group_payment_calender mgpc
 | 
	
		
			
				|  |  | +    <sql id="queryPageSql">
 | 
	
		
			
				|  |  |          <where>
 | 
	
		
			
				|  |  | -        	<if test="musicGroupId != null">
 | 
	
		
			
				|  |  | -        		and mgpc.music_group_id_ = #{musicGroupId}
 | 
	
		
			
				|  |  | -        	</if>
 | 
	
		
			
				|  |  | -        	<if test="payUserType != null">
 | 
	
		
			
				|  |  | -        		and mgpc.pay_user_type_ = #{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
	
		
			
				|  |  | -        	</if>
 | 
	
		
			
				|  |  | +            <if test="musicGroupId != null">
 | 
	
		
			
				|  |  | +                AND mgpc.music_group_id_ = #{musicGroupId}
 | 
	
		
			
				|  |  | +            </if>
 | 
	
		
			
				|  |  | +            <if test="payUserType != null">
 | 
	
		
			
				|  |  | +                AND mgpc.pay_user_type_ = #{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
	
		
			
				|  |  | +            </if>
 | 
	
		
			
				|  |  |              <if test="paymentType != null">
 | 
	
		
			
				|  |  | -                and mgpc.payment_type_ = #{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
	
		
			
				|  |  | +                AND mgpc.payment_type_ = #{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
	
		
			
				|  |  | +            </if>
 | 
	
		
			
				|  |  | +            <if test="status != null">
 | 
	
		
			
				|  |  | +                AND mgpc.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
	
		
			
				|  |  |              </if>
 | 
	
		
			
				|  |  | -        	<if test="status != null">
 | 
	
		
			
				|  |  | -        		and mgpc.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
	
		
			
				|  |  | -        	</if>
 | 
	
		
			
				|  |  |          </where>
 | 
	
		
			
				|  |  | +    </sql>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    <!-- 查询当前表的总记录数 -->
 | 
	
		
			
				|  |  | +    <select id="queryCount" resultType="int">
 | 
	
		
			
				|  |  | +		SELECT COUNT(mgpc.id_) FROM music_group_payment_calender mgpc
 | 
	
		
			
				|  |  | +		<include refid="queryPageSql"/>
 | 
	
		
			
				|  |  |  	</select>
 | 
	
		
			
				|  |  |  	
 | 
	
		
			
				|  |  |      <select id="findByMusicGroupId" resultMap="MusicGroupPaymentCalender">
 |