1

web/src/main/resources/sql/jlw/student.md

@@ -1570,6 +1570,7 @@ queryStudentLoginLogByCondition
       td.universities_colleges_province,
       td.class_name
   ) z
+  order by z.login_time desc
  
 queryStudentUseLogByCondition
 ===
@@ -1672,6 +1673,7 @@ queryStudentUseLogByCondition
     tb.application_name,
     td.class_name
   ) z
+  order by z.login_time desc
 
 queryStudentLogAnalysisByCondition
 ===
@@ -1682,13 +1684,22 @@ queryStudentLogAnalysisByCondition
   Z.*
   @} 
   FROM (
+    SELECT
+      zz.time,
+      zz.universities_colleges_name,
+      zz.universities_colleges_province,
+      zz.login_count,
+      @// 当前时间和日志的创建是同一天的话，在线人数就根据人头数来算。否则就是0
+      ( CASE WHEN TO_DAYS( now()) = TO_DAYS( zz.time ) THEN zz.on_line_count ELSE 0 END ) AS on_line_count
+    FROM
+    (
     SELECT
       @// 日期
       DATE_FORMAT(ta.create_time, '%Y-%m-%d') as time,
       te.universities_colleges_name,
       te.universities_colleges_province,
       count( 1 ) AS login_count,
-    count( DISTINCT ta.user_id ) AS on_line_count
+      count( ta.user_id )  AS on_line_count
     FROM
     sys_log ta
     LEFT JOIN student t ON ta.user_id = t.user_id
@@ -1709,7 +1720,9 @@ queryStudentLogAnalysisByCondition
     and ta.create_time <= #loginEndTime#
     @}
     GROUP BY
-  DATE_FORMAT(ta.create_time, '%Y-%m-%d'),
+    `time`,
     te.universities_colleges_name,
     te.universities_colleges_province
+    ) zz
   ) Z
+  order by z.time desc