|
|
@@ -166,7 +166,7 @@
|
|
|
sr.user_id_
|
|
|
FROM
|
|
|
student_registration sr
|
|
|
- LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
|
|
|
+ LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
|
|
|
WHERE
|
|
|
mg.status_ IN ( 'PREPARE', 'PROGRESS' )
|
|
|
AND sr.music_group_status_ = 'NORMAL'
|
|
|
@@ -182,6 +182,7 @@
|
|
|
cs.del_flag_ = 0
|
|
|
AND ( cs.is_lock_ = 0 OR cs.is_lock_ IS NULL )
|
|
|
AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
|
|
|
+ AND cssp.group_type_ IN ('VIP', 'PRACTICE')
|
|
|
AND cs.organ_id_ IS NOT NULL
|
|
|
AND DATE_FORMAT(cssp.create_time_, '%Y-%m-%d')<=#{dayStr}
|
|
|
)) u
|
|
|
@@ -238,7 +239,7 @@
|
|
|
#{dayStr} month_,
|
|
|
COUNT( DISTINCT stu.user_id_ ) total_num_,
|
|
|
COUNT( DISTINCT (CASE WHEN DATE_FORMAT( spo.pay_time_, '%Y-%m-%d' ) <= #{dayStr} THEN spo.user_id_ ELSE NULL END) ) activate_num_,
|
|
|
- TRUNCATE(COUNT(DISTINCT spo.user_id_)/COUNT(DISTINCT stu.user_id_)*100, 2) percent_
|
|
|
+ TRUNCATE(COUNT(DISTINCT (CASE WHEN DATE_FORMAT( spo.pay_time_, '%Y-%m-%d' ) <= #{dayStr} THEN spo.user_id_ ELSE NULL END))/COUNT(DISTINCT stu.user_id_)*100, 2) percent_
|
|
|
FROM
|
|
|
student stu
|
|
|
LEFT JOIN sys_user su ON stu.user_id_=su.id_
|
Joburgess