Merge remote-tracking branch 'origin/online1' into online1

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -472,7 +472,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                 if(studentGroupNamesMap.containsKey(eduOrganStudentListDto.getStudentId())){
                     eduOrganStudentListDto.setMusicGroupNames(studentGroupNamesMap.get(eduOrganStudentListDto.getStudentId()));
                 }
-                if(hasVipCourseStudentIds.contains(eduOrganStudentListDto.getSubjectId())){
+                if(hasVipCourseStudentIds.contains(eduOrganStudentListDto.getStudentId())){
                     eduOrganStudentListDto.setHasVipGroup(1);
                 }
                 if(eduOrganStudentListDto.getCloudStudyUseNum()>0 && eduOrganStudentListDto.getCloudStudyUseTime()>0){
@@ -717,7 +717,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             comparing = Comparator.comparing(EduOrganStudentDataDto::getOrganId);
         }
 
-        result = result.stream().skip(pageInfo.getOffset()).limit(pageInfo.getLimit()).sorted(comparing).collect(Collectors.toList());
+        result = result.stream().sorted(comparing).skip(pageInfo.getOffset()).limit(pageInfo.getLimit()).collect(Collectors.toList());
         pageInfo.setRows(result);
         return pageInfo;
     }

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

@@ -766,7 +766,7 @@
 		ORDER BY vg.create_time_ DESC LIMIT 1
 	</select>
 
-    <select id="getHasVipCourseStudentIds" resultType="map">
+    <select id="getHasVipCourseStudentIds" resultType="int">
 		SELECT cssp.user_id_ FROM course_schedule_student_payment cssp
 		LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_
 		WHERE cssp.group_type_='VIP' AND cs.del_flag_=0

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

@@ -1051,7 +1051,7 @@
             SUM(CASE WHEN smcr.play_time_ IS NULL THEN 0 ELSE play_time_ END) cloudStudyUseTime,
             COUNT(DISTINCT DATE(smcr.create_time_)) cloudStudyUseDays,
             stu.membership_end_time_ membershipEndTime
-        FROM ((
+        FROM (SELECT DISTINCT t1.user_id_ FROM ((
                 SELECT
                 sr.user_id_
                 FROM
@@ -1070,7 +1070,7 @@
                 WHERE
                 cssp.group_type_ IN ( 'VIP', 'PRACTICE' )
                 AND cs.status_ = 'NOT_START'
-                )) t
+                )) t1) t
             LEFT JOIN student stu ON t.user_id_=stu.user_id_
             LEFT JOIN sys_user su ON stu.user_id_=su.id_
             LEFT JOIN sys_user tea ON stu.teacher_id_=tea.id_