Merge branch 'online1'

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

@@ -31,6 +31,8 @@ public class MusicGroupPaymentCalenderDetail {
 	
 	/**  */
 	private PaymentStatus paymentStatus;
+
+	private MusicGroupPaymentCalender.PaymentType paymentType;
 	
 	/**  */
 	private String userStatus;
@@ -78,6 +80,14 @@ public class MusicGroupPaymentCalenderDetail {
 	
 	private SysUser responsible = new SysUser();
 
+	public MusicGroupPaymentCalender.PaymentType getPaymentType() {
+		return paymentType;
+	}
+
+	public void setPaymentType(MusicGroupPaymentCalender.PaymentType paymentType) {
+		this.paymentType = paymentType;
+	}
+
 	public Date getStartPaymentDateMgpc() {
 		return startPaymentDateMgpc;
 	}

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

@@ -18,17 +18,6 @@ public class ArrearageStudentsQueryInfo extends QueryInfo {
 
     private Integer eduTeacherId;
 
-    @ApiModelProperty(value = "缴费类型", required = false)
-    private MusicGroupPaymentCalender.PaymentType paymentType;
-
-    public MusicGroupPaymentCalender.PaymentType getPaymentType() {
-        return paymentType;
-    }
-
-    public void setPaymentType(MusicGroupPaymentCalender.PaymentType paymentType) {
-        this.paymentType = paymentType;
-    }
-
     public String getOrganIds() {
         return organIds;
     }

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

@@ -11,6 +11,7 @@
 		<result column="expect_amount_" property="expectAmount" />
 		<result column="actual_amount_" property="actualAmount" />
 		<result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="payment_type_" property="paymentType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="user_status_" property="userStatus" />
 		<result column="music_group_id_" property="musicGroupId" />
 		<result column="pay_time_" property="payTime" />
@@ -206,7 +207,7 @@
 		SELECT su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_,tu.real_name_ responsible_username_,
 		CASE WHEN mgpcd.start_payment_date_ IS NULL THEN mgpc.start_payment_date_ ELSE mgpcd.start_payment_date_ END start_payment_date_mgpc_,
 		CASE WHEN mgpcd.deadline_payment_date_ IS NULL THEN mgpc.deadline_payment_date_ ELSE mgpcd.deadline_payment_date_ END deadline_payment_date_mgpc_,
-		CASE WHEN mgpc.status_ = 'OPEN' OR mgpcd.open_ = 1 THEN 1 ELSE 0 END open_,mgpcd.*
+		CASE WHEN mgpc.status_ = 'OPEN' OR mgpcd.open_ = 1 THEN 1 ELSE 0 END open_,mgpc.payment_type_,mgpcd.*
 		FROM music_group_payment_calender_detail mgpcd
 		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
 		left join sys_user tu on tu.id_ = mgpcd.responsible_user_id_
@@ -419,7 +420,6 @@
 		<result property="parentName" column="parent_name_"/>
 		<result property="phone" column="phone_"/>
 		<result property="noPaymentAmount" column="no_payment_amount_"/>
-		<result property="paymentType" column="payment_type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 
 	<sql id="queryArrearageStudentsCondition">
@@ -446,9 +446,6 @@
 			<if test="search!=null and search!=''">
 				AND (mgpcd.user_id_=#{search} OR su.username_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
-			<if test="paymentType!=null">
-				AND mgpc.payment_type_=#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-			</if>
 		</where>
 	</sql>
 
@@ -461,7 +458,6 @@
 			co.name_ cooperation_name_,
 		    mgpc.music_group_id_,
 			mg.name_ music_group_name_,
-		    mgpc.payment_type_,
 			edu.real_name_ edu_teacher_name_,
 			MAX( sub.name_ ) subject_name_,
 			su.gender_ gender_,