zouxuan 5 سال پیش
والد
کامیت
d1b7c2965e
1فایلهای تغییر یافته به همراه4 افزوده شده و 2 حذف شده
  1. 4 2
      mec-biz/src/main/resources/config/mybatis/PracticeGroupMapper.xml

+ 4 - 2
mec-biz/src/main/resources/config/mybatis/PracticeGroupMapper.xml

@@ -396,7 +396,8 @@
         LEFT JOIN `course_schedule` cs on cs.`music_group_id_` = pg.`id_`
         WHERE cs.`group_type_` = 'PRACTICE' AND pg.`buy_months_` IS NULL
         GROUP BY pg.`student_id_` ) a
-        left join (SELECT pg.`student_id_` ,min(pg.`create_time_`) firstBuyTime  FROM `practice_group` pg WHERE pg.`buy_months_` IS NOT NULL GROUP BY pg.`student_id_` ) b
+        left join (SELECT pg.`student_id_` ,min(pg.`create_time_`) firstBuyTime
+        FROM `practice_group` pg WHERE pg.`buy_months_` IS NOT NULL AND pg.group_status_ != 'CANCEL' GROUP BY pg.`student_id_` ) b
         on a.student_id_ = b.student_id_
         left join `sys_user` u on u.`id_` = a.student_id_
         <include refid="queryStudentBuysSql"/>
@@ -421,7 +422,8 @@
         LEFT JOIN `course_schedule` cs on cs.`music_group_id_` = pg.`id_`
         WHERE cs.`group_type_` = 'PRACTICE' AND pg.`buy_months_` IS NULL
         GROUP BY pg.`student_id_` ) a
-        left join (SELECT pg.`student_id_` ,min(pg.`create_time_`) firstBuyTime  FROM `practice_group` pg WHERE pg.`buy_months_` IS NOT NULL GROUP BY pg.`student_id_` ) b
+        left join (SELECT pg.`student_id_` ,min(pg.`create_time_`) firstBuyTime
+        FROM `practice_group` pg WHERE pg.`buy_months_` IS NOT NULL AND pg.group_status_ != 'CANCEL' GROUP BY pg.`student_id_` ) b
         on a.student_id_ = b.student_id_
         left join `sys_user` u on u.`id_` = a.student_id_
         left join `organization` o on o.`id_` = u.`organ_id_`