|
@@ -141,7 +141,7 @@
|
|
|
<select id="getStudentSignUpData" resultMap="IndexBaseMonthData">
|
|
|
SELECT
|
|
|
organ_id_,
|
|
|
- CONCAT(DATE_FORMAT(NOW(), '%Y-%m'), '-01') month_,
|
|
|
+ CONCAT(#{month}, '-01') month_,
|
|
|
COUNT( id_ ) total_num_,
|
|
|
COUNT(CASE WHEN password_ IS NOT NULL THEN id_ ELSE NULL END) activate_num_,
|
|
|
TRUNCATE(COUNT(CASE WHEN password_ IS NOT NULL THEN id_ ELSE NULL END)/COUNT( id_ )*100, 2) percent_
|
|
@@ -150,7 +150,8 @@
|
|
|
del_flag_=0
|
|
|
AND organ_id_ IS NOT NULL
|
|
|
AND user_type_ LIKE '%STUDENT%'
|
|
|
- AND YEAR(create_time_)=YEAR(NOW())
|
|
|
+ AND YEAR(create_time_)=YEAR(#{month})
|
|
|
+ AND MONTH(create_time_)<=MONTH(#{month})
|
|
|
GROUP BY organ_id_
|
|
|
ORDER BY organ_id_;
|
|
|
</select>
|
|
@@ -158,7 +159,7 @@
|
|
|
<select id="getHomeworkData" resultMap="IndexBaseMonthData">
|
|
|
SELECT
|
|
|
su.organ_id_,
|
|
|
- CONCAT(DATE_FORMAT(NOW(), '%Y-%m'), '-01') month_,
|
|
|
+ CONCAT(#{month}, '-01') month_,
|
|
|
<choose>
|
|
|
<when test="type == 'submit'">
|
|
|
SUM(sees.expect_exercises_num_) total_num_,
|
|
@@ -180,7 +181,8 @@
|
|
|
LEFT JOIN sys_user su ON sees.student_id_=su.id_
|
|
|
WHERE su.del_flag_=0
|
|
|
AND su.organ_id_ IS NOT NULL
|
|
|
- AND YEAR(sees.monday_)=YEAR(NOW())
|
|
|
+ AND YEAR(sees.monday_)=YEAR(#{month})
|
|
|
+ AND MONTH(sees.monday_)<=MONTH(#{month})
|
|
|
GROUP BY su.organ_id_
|
|
|
ORDER BY su.organ_id_
|
|
|
</select>
|