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

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicArrearageStudentDto.java

@@ -1,5 +1,8 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 
 /**
@@ -32,6 +35,17 @@ public class MusicArrearageStudentDto {
 
     private BigDecimal noPaymentAmount;
 
+    @ApiModelProperty(value = "缴费类型", required = false)
+    private MusicGroupPaymentCalender.PaymentType paymentType;
+
+    public MusicGroupPaymentCalender.PaymentType getPaymentType() {
+        return paymentType;
+    }
+
+    public void setPaymentType(MusicGroupPaymentCalender.PaymentType paymentType) {
+        this.paymentType = paymentType;
+    }
+
     public Integer getUserId() {
         return userId;
     }

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

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author Joburgess
@@ -16,6 +18,17 @@ 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

@@ -419,6 +419,7 @@
 		<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">
@@ -445,6 +446,9 @@
 			<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>
 
@@ -457,6 +461,7 @@
 			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_,