|
|
@@ -237,7 +237,7 @@
|
|
|
su.organ_id_,
|
|
|
#{dayStr} month_,
|
|
|
COUNT( DISTINCT stu.user_id_ ) total_num_,
|
|
|
- COUNT( DISTINCT spo.user_id_ ) activate_num_,
|
|
|
+ COUNT( DISTINCT (CASE WHEN DATE_FORMAT( spo.create_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_
|
|
|
FROM
|
|
|
student stu
|
|
|
@@ -247,7 +247,7 @@
|
|
|
su.del_flag_=0
|
|
|
AND su.organ_id_ IS NOT NULL
|
|
|
AND su.user_type_ LIKE '%STUDENT%'
|
|
|
- AND DATE_FORMAT(spo.create_time_, '%Y-%m-%d')<=#{dayStr}
|
|
|
+ AND DATE_FORMAT(su.create_time_, '%Y-%m-%d')<=#{dayStr}
|
|
|
GROUP BY organ_id_
|
|
|
ORDER BY organ_id_;
|
|
|
</select>
|
zouxuan