Merge branch 'music_group_feature_03_29'

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.enums.PaymentFlagEnum;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -9,6 +10,9 @@ import java.util.Date;
 
 public class MusicGroupStudentsDto{
 
+    @ApiModelProperty(value = "学生乐团注册编号",required = false)
+    private Integer studentRegistrationId;
+
     @ApiModelProperty(value = "学生编号",required = false)
     private Integer userId;
 
@@ -57,7 +61,7 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "退团原因",required = false)
     private String quitReason;
 
-    private PaymentFlagEnum paymentStatus;
+    private PaymentStatusEnum paymentStatus;
 
     @ApiModelProperty(value = "是否新增学员（1是0否）",required = false)
     private Integer isNewStudent;
@@ -83,7 +87,7 @@ public class MusicGroupStudentsDto{
     private BigDecimal subTotalCourseTime;
 
     @ApiModelProperty(value = "欠费金额",required = false)
-    private BigDecimal noPaymentAmount;
+    private BigDecimal noPaymentAmount = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "关心包：0：默认不可用；1：可用；2：已使用;")
     private Integer carePackage;
@@ -96,6 +100,14 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "备注信息",required = false)
     private String remark;
 
+    public Integer getStudentRegistrationId() {
+        return studentRegistrationId;
+    }
+
+    public void setStudentRegistrationId(Integer studentRegistrationId) {
+        this.studentRegistrationId = studentRegistrationId;
+    }
+
     @ApiModelProperty(value = "声部更换详情",required = false)
     private SubjectChange subjectChange;
 
@@ -267,11 +279,11 @@ public class MusicGroupStudentsDto{
         this.studentStatus = studentStatus;
     }
 
-    public PaymentFlagEnum getPaymentStatus() {
+    public PaymentStatusEnum getPaymentStatus() {
         return paymentStatus;
     }
 
-    public void setPaymentStatus(PaymentFlagEnum paymentStatus) {
+    public void setPaymentStatus(PaymentStatusEnum paymentStatus) {
         this.paymentStatus = paymentStatus;
     }
 

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

@@ -451,11 +451,8 @@
             <if test="studentStatus != null and studentStatus != ''">
                 AND sr.music_group_status_ = #{studentStatus}
             </if>
-            <if test="paymentStatus != null and paymentStatus == 1">
-                AND sr.payment_status_ = 2
-            </if>
-            <if test="paymentStatus != null and paymentStatus == 0">
-                AND sr.payment_status_ IN (0,1)
+            <if test="paymentStatus != null">
+                AND sr.payment_status_ = #{paymentStatus}
             </if>
             <if test="musicGroupId != null and musicGroupId != ''">
                 AND sr.music_group_id_ = #{musicGroupId}
@@ -487,6 +484,7 @@
         </where>
     </sql>
     <resultMap id="MusicGroupStudentsDto" type="com.ym.mec.biz.dal.dto.MusicGroupStudentsDto">
+        <result property="studentRegistrationId" column="student_registration_id_"/>
         <result property="userId" column="user_id_"/>
         <result property="realName" column="real_name_"/>
         <result property="phone" column="parents_phone_"/>
@@ -511,10 +509,9 @@
         <result column="come_on_package_" property="comeOnPackage"/>
         <result column="registerTime" property="registerTime"/>
         <result column="remark_" property="remark"/>
-        <result column="remark_" property="remark"/>
     </resultMap>
     <select id="queryMusicGroupStudent" resultMap="MusicGroupStudentsDto">
-        SELECT sr.user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,sr.current_grade_,sr.current_grade_date_,
+        SELECT sr.id_ student_registration_id_,sr.user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,sr.current_grade_,sr.current_grade_date_,
         sr.current_class_,sr.music_group_status_ student_status_,sr.payment_status_,sr.subject_id_ reg_subject_id_,rs.name_ regSubjectName,sr.remark_,
         sr.actual_subject_id_ subject_id_,s.name_ subject_name_,sr.music_group_id_,CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
         IF(DATE_FORMAT(sr.create_time_,'%Y-%m-%d') > DATE_FORMAT(mg.payment_expire_date_,'%Y-%m-%d'),1,0) is_new_student_,