update 乐团学员列表、 1.乐团学员列表 缴费状态paymentStatus同步(1是已缴费 改为1是开启缴费 2为已缴费)

 2.乐团学员列表 添加字段 调剂前的专业

 3.乐团学员列表 新增备注

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

@@ -29,9 +29,18 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "班级",required = false)
     private String currentClass;
 
-    @ApiModelProperty(value = "专业",required = false)
+    @ApiModelProperty(value = "实际专业id",required = false)
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "实际专业",required = false)
     private String subjectName;
 
+    @ApiModelProperty(value = "报名专业id",required = false)
+    private Integer regSubjectId;
+
+    @ApiModelProperty(value = "报名专业",required = false)
+    private String regSubjectName;
+
     @ApiModelProperty(value = "下次缴费日期",required = false)
     private Date nextPaymentDate;
 
@@ -83,6 +92,9 @@ public class MusicGroupStudentsDto{
     private Integer comeOnPackage;
     private String comeOnPackageStr;
 
+    @ApiModelProperty(value = "备注信息",required = false)
+    private String remark;
+
     public String getCarePackageStr() {
         return carePackageStr;
     }
@@ -314,4 +326,36 @@ public class MusicGroupStudentsDto{
     public void setRegisterTime(Date registerTime) {
         this.registerTime = registerTime;
     }
+
+    public String getRegSubjectName() {
+        return regSubjectName;
+    }
+
+    public void setRegSubjectName(String regSubjectName) {
+        this.regSubjectName = regSubjectName;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Integer getRegSubjectId() {
+        return regSubjectId;
+    }
+
+    public void setRegSubjectId(Integer regSubjectId) {
+        this.regSubjectId = regSubjectId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

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

@@ -493,7 +493,10 @@
         <result property="currentGrade" column="current_grade_"/>
         <result property="currentGradeDate" column="current_grade_date_"/>
         <result property="currentClass" column="current_class_"/>
+        <result property="subjectId" column="subject_id_"/>
         <result property="subjectName" column="subject_name_"/>
+        <result property="regSubjectId" column="reg_subject_id_"/>
+        <result property="regSubjectName" column="regSubjectName"/>
         <result property="studentStatus" column="student_status_"/>
         <result property="paymentStatus" column="payment_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="musicGroupId" column="music_group_id_"/>
@@ -506,16 +509,19 @@
         <result column="care_package_" property="carePackage"/>
         <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_,
-        sr.current_class_,sr.music_group_status_ student_status_,CASE WHEN sr.payment_status_ = 2 THEN 1 ELSE 0 END payment_status_,
-        s.name_ subject_name_,sr.music_group_id_,CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
+        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_,
         stu.care_package_,stu.come_on_package_,sr.create_time_ registerTime
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
-        LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
+        LEFT JOIN subject s ON s.id_ = sr.actual_subject_id_
+        LEFT JOIN subject rs ON rs.id_ = sr.subject_id_
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         LEFT JOIN student stu ON sr.user_id_ = stu.user_id_
         <if test="classGroupId != null">