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

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

@@ -264,6 +264,7 @@
             <result property="value" column="value"/>
         </collection>
     </resultMap>
+
     <select id="queryStudentSubTotalCourseTimes" resultMap="StudentSubTotalCourseTimesDto">
         SELECT mgpscd.user_id_,
                su.username_,
@@ -304,11 +305,9 @@
     <!-- 查询当前表的总记录数 -->
     <select id="countStudentSubTotalCourseTimes" resultType="java.lang.Integer">
     select count(*) from (
-        SELECT
-            mgpscd.user_id_,mgpscd.course_type_
-        FROM music_group_payment_student_course_detail mgpscd
-        LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
+        SELECT mgpscd.user_id_ FROM music_group_payment_student_course_detail mgpscd
         LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
+        LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
         left join (
             SELECT
                 user_id_ ,GROUP_CONCAT(class_group_id_) as class_group_id_
@@ -317,17 +316,19 @@
             GROUP BY user_id_
         ) v on mgpscd.user_id_ = v.user_id_
         <include refid="sqlStudentSubTotalCourseTimes"/>
-        GROUP BY mgpscd.user_id_,mgpscd.course_type_
+        GROUP BY mgpscd.user_id_
     ) a
     </select>
 
     <select id="pageStudentSubTotalCourseTimes" resultMap="StudentSubTotalCourseTimesDto"
             parameterType="map">
-        SELECT mgpscd.user_id_,su.username_,su.phone_,mgpscd.course_type_ 'key',mgpscd.course_type_,
-            SUM(CASE WHEN mgpscd.used_course_minutes_ = 0 THEN mgpscd.total_course_minutes_ ELSE 0 END) 'value'
+        SELECT
+               mgpscd.user_id_,su.username_,su.phone_,
+               mgpscd.course_type_ 'key',
+               SUM(CASE WHEN mgpscd.used_course_minutes_ = 0 THEN mgpscd.total_course_minutes_ ELSE 0 END) 'value'
         FROM music_group_payment_student_course_detail mgpscd
-        LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
         LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
+        LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
         left join (
             SELECT
                 user_id_ ,GROUP_CONCAT(class_group_id_) as class_group_id_