update

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

@@ -1,16 +1,16 @@
 package com.ym.mec.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
 import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
-
+import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.enums.UserGenderEnum;
-import com.ym.mec.common.page.QueryInfo;
-
-import java.math.BigDecimal;
-import java.util.Date;
 
 public class StudentApplyDetailDto{
 
@@ -59,6 +59,9 @@ public class StudentApplyDetailDto{
 
     @ApiModelProperty(value = "学员缴费状态",required = false)
     private PaymentStatusEnum paymentStatus;
+    
+    @ApiModelProperty(value = "学员在团状态",required = false)
+    private StudentMusicGroupStatusEnum studentStatus;
 
     @ApiModelProperty(value = "乐器团购类型",required = false)
     private KitGroupPurchaseTypeEnum kitGroupPurchaseTypeEnum;
@@ -291,4 +294,12 @@ public class StudentApplyDetailDto{
     public void setNoneNeedCloudTeacher(Integer noneNeedCloudTeacher) {
         this.noneNeedCloudTeacher = noneNeedCloudTeacher;
     }
+
+	public StudentMusicGroupStatusEnum getStudentStatus() {
+		return studentStatus;
+	}
+
+	public void setStudentStatus(StudentMusicGroupStatusEnum studentStatus) {
+		this.studentStatus = studentStatus;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/OrganizationService.java

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.Organization;
-import com.ym.mec.biz.dal.enums.GradeTypeEnum;
 import com.ym.mec.biz.dal.page.OrganizationQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;

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

@@ -417,6 +417,9 @@
             <if test="paymentStatus != null">
                 AND sr.payment_status_ = #{paymentStatus}
             </if>
+            <if test="studentStatus != null">
+                AND sr.music_group_status_ = #{studentStatus}
+            </if>
             <if test="visited != null and visited == true">
                 AND sv.num >0
             </if>
@@ -458,6 +461,8 @@
         <result column="actual_subject_name_" property="actualSubjectName"/>
         <result column="payment_status_" property="paymentStatus"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="music_group_status_" property="studentStatus"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="gender_" property="gender" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="user_id_" property="studentId"/>
         <result column="id_" property="id"/>
@@ -484,6 +489,7 @@
         actual_subject_name_,
         su.phone_ parents_phone_,
         sr.payment_status_,
+        sr.music_group_status_,
         sr.remark_,
         sr.actual_subject_id_,
         IFNULL(sv.num, 0) visit_num_,