Merge remote-tracking branch 'origin/master'

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

@@ -246,7 +246,7 @@
         SELECT cssp.user_id_,
         SUM(case when (cs.group_type_ = 'VIP' AND cs.teach_mode_='ONLINE') then 1 ELSE 0 END) vip_times_,
         SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_,
-        SUM(case when (cs.type_='MUSIC_NETWORK') then 1 ELSE 0 END) music_netWork_times_
+        SUM(case when (cs.type_='MUSIC_NETWORK' OR cs.type_='HIGH_ONLINE') then 1 ELSE 0 END) music_netWork_times_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
@@ -272,7 +272,7 @@
         SELECT cssp.user_id_,
         SUM(case when (cs.group_type_ = 'VIP' AND cs.teach_mode_='ONLINE') then 1 ELSE 0 END) vip_times_,
         SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_,
-        SUM(case when (cs.type_='MUSIC_NETWORK') then 1 ELSE 0 END) music_netWork_times_
+        SUM(case when (cs.type_='MUSIC_NETWORK' OR cs.type_='HIGH_ONLINE') then 1 ELSE 0 END) music_netWork_times_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'