Merge remote-tracking branch 'origin/master'

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

@@ -193,7 +193,7 @@
         WHERE cgsm.music_group_id_ = #{musicGroupId}
         AND cgsm.user_id_=#{userId}
         AND cg.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-        AND cgsm.status_='NORMAL'
+        AND FIND_IN_SET(cgsm.status_,'NORMAL,LEAVE')
     </select>
     <select id="findClassGroupIdByUserAndCourseDateAndStatus" resultType="int">
         SELECT

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

@@ -1481,11 +1481,11 @@
     </delete>
     
     <select id="queryUnsignedStudentList" resultMap="StudentAttendance">
-        SELECT a.*,cg.current_class_times_,sa.id_ FROM (SELECT cgsm.user_id_,cs.actual_teacher_id_ teacher_id_,
+        SELECT a.*,cg.current_class_times_,sa.id_ FROM (SELECT cssp.user_id_,cs.actual_teacher_id_ teacher_id_,
         cs.id_ course_schedule_id_,cs.class_group_id_,cs.music_group_id_,cs.group_type_
-        FROM class_group_student_mapper cgsm
-        right JOIN course_schedule cs ON cgsm.class_group_id_ = cs.class_group_id_
-        WHERE cgsm.status_ = 'NORMAL' AND CONCAT(cs.class_date_,' ',cs.end_class_time_) &lt;= now()) a
+        FROM course_schedule_student_payment cssp
+        LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
+        WHERE CONCAT(cs.class_date_,' ',cs.end_class_time_) &lt;= now() AND cssp.actual_price_ IS NOT NULL) a
         LEFT JOIN class_group cg ON a.class_group_id_ = cg.id_
         LEFT JOIN student_attendance sa ON sa.user_id_ = a.user_id_ AND a.teacher_id_ = sa.teacher_id_
         AND sa.class_group_id_ = a.class_group_id_ AND sa.course_schedule_id_ = a.course_schedule_id_

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

@@ -496,6 +496,7 @@
         <if test="vipGroupStatus != null">
             AND vg.status_ = #{vipGroupStatus}
         </if>
+        <include refid="global.limit"/>
     </select>
     <select id="countStudentVipGroupClass" resultType="java.lang.Integer">
         SELECT COUNT(vg.id_)

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -3,7 +3,9 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.StudentManageService;
 import com.ym.mec.biz.service.StudentRegistrationService;