|
|
@@ -1212,15 +1212,16 @@
|
|
|
COUNT(distinct CASE WHEN smcr.train_time_ >= 120 AND smcr.train_time_ < 240 THEN smcr.user_id_ END) 'train3',
|
|
|
COUNT(distinct CASE WHEN smcr.train_time_ >= 240 THEN smcr.user_id_ END) 'train4',
|
|
|
SUM(smcr.train_time_) train_total_time_,COUNT(distinct CASE WHEN smcr.train_time_ > 60 THEN smcr.user_id_ END) 'train0'
|
|
|
- from music_group mg
|
|
|
+ from (select distinct sr.user_id_ from music_group mg
|
|
|
left join student_registration sr ON mg.id_ = sr.music_group_id_
|
|
|
- left join student s ON sr.user_id_ = s.user_id_
|
|
|
+ where mg.status_ = 'PROGRESS' AND sr.music_group_status_ = 'NORMAL') mg
|
|
|
+ left join student s ON mg.user_id_ = s.user_id_
|
|
|
left join (select smcr.user_id_,ROUND(SUM(smcr.play_time_)/60/#{queryInfo.weekBetween}) train_time_ from sys_music_compare_record smcr
|
|
|
where DATE_FORMAT(smcr.create_time_,'%Y-%m-%d') between #{queryInfo.startDate} AND #{queryInfo.endDate}
|
|
|
group by smcr.user_id_) smcr ON s.user_id_ = smcr.user_id_
|
|
|
- left JOIN sys_user su ON su.id_ = sr.user_id_
|
|
|
+ left JOIN sys_user su ON su.id_ = mg.user_id_
|
|
|
left join organization o ON o.id_ = su.organ_id_
|
|
|
- where mg.status_ = 'PROGRESS' AND sr.music_group_status_ = 'NORMAL' AND s.membership_end_time_ >= NOW()
|
|
|
+ where s.membership_end_time_ >= NOW()
|
|
|
<if test="queryInfo.organId != null and queryInfo.organId != ''">
|
|
|
AND FIND_IN_SET(su.organ_id_,#{queryInfo.organId})
|
|
|
</if>
|
zouxuan