乐团页面整合，学员列表页面可以开启报名缴费

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

@@ -9,6 +9,9 @@ import java.util.Date;
 
 public class MusicGroupStudentsDto{
 
+    @ApiModelProperty(value = "学生乐团注册编号",required = false)
+    private Integer studentRegistrationId;
+
     @ApiModelProperty(value = "学生编号",required = false)
     private Integer userId;
 
@@ -84,6 +87,14 @@ public class MusicGroupStudentsDto{
     private Integer comeOnPackage;
     private String comeOnPackageStr;
 
+    public Integer getStudentRegistrationId() {
+        return studentRegistrationId;
+    }
+
+    public void setStudentRegistrationId(Integer studentRegistrationId) {
+        this.studentRegistrationId = studentRegistrationId;
+    }
+
     public String getCarePackageStr() {
         return carePackageStr;
     }

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

@@ -484,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_"/>
@@ -506,7 +507,7 @@
         <result column="registerTime" property="registerTime"/>
     </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_,
         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_,