|
@@ -394,7 +394,7 @@
|
|
(SELECT pg.`student_id_` ,max(concat(cs.`class_date_`,' ',cs.`end_class_time_` )) lastClassDate
|
|
(SELECT pg.`student_id_` ,max(concat(cs.`class_date_`,' ',cs.`end_class_time_` )) lastClassDate
|
|
FROM `practice_group` pg
|
|
FROM `practice_group` pg
|
|
LEFT JOIN `course_schedule` cs on cs.`music_group_id_` = pg.`id_`
|
|
LEFT JOIN `course_schedule` cs on cs.`music_group_id_` = pg.`id_`
|
|
- WHERE cs.`group_type_` = 'PRACTICE' AND pg.`buy_months_` IS NULL
|
|
|
|
|
|
+ WHERE cs.`group_type_` = 'PRACTICE' AND pg.`buy_months_` IS NULL AND pg.group_status_ != 'CANCEL'
|
|
GROUP BY pg.`student_id_` ) a
|
|
GROUP BY pg.`student_id_` ) a
|
|
left join (SELECT pg.`student_id_` ,min(pg.`create_time_`) firstBuyTime
|
|
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
|
|
FROM `practice_group` pg WHERE pg.`buy_months_` IS NOT NULL AND pg.group_status_ != 'CANCEL' GROUP BY pg.`student_id_` ) b
|
|
@@ -420,7 +420,7 @@
|
|
(SELECT pg.`student_id_` ,max(concat(cs.`class_date_`,' ',cs.`end_class_time_` )) lastClassDate
|
|
(SELECT pg.`student_id_` ,max(concat(cs.`class_date_`,' ',cs.`end_class_time_` )) lastClassDate
|
|
FROM `practice_group` pg
|
|
FROM `practice_group` pg
|
|
LEFT JOIN `course_schedule` cs on cs.`music_group_id_` = pg.`id_`
|
|
LEFT JOIN `course_schedule` cs on cs.`music_group_id_` = pg.`id_`
|
|
- WHERE cs.`group_type_` = 'PRACTICE' AND pg.`buy_months_` IS NULL
|
|
|
|
|
|
+ WHERE cs.`group_type_` = 'PRACTICE' AND pg.`buy_months_` IS NULL AND pg.group_status_ != 'CANCEL'
|
|
GROUP BY pg.`student_id_` ) a
|
|
GROUP BY pg.`student_id_` ) a
|
|
left join (SELECT pg.`student_id_` ,min(pg.`create_time_`) firstBuyTime
|
|
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
|
|
FROM `practice_group` pg WHERE pg.`buy_months_` IS NOT NULL AND pg.group_status_ != 'CANCEL' GROUP BY pg.`student_id_` ) b
|