diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/StudentLoginLogVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/StudentLoginLogVO.java index d86bc826..809aea1a 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/vo/StudentLoginLogVO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/StudentLoginLogVO.java @@ -57,43 +57,43 @@ public class StudentLoginLogVO extends BaseEntity { /** * 班级名称 */ - @ExcelProperty(value = "班级名称", index = 5) + @ExcelProperty(value = "班级名称", index = 4) private String className; /** * 登入时间 */ - @ExcelProperty(value = "登入时间", index = 6) + @ExcelProperty(value = "登入时间", index = 5) private String loginTime; /** * 登出时间 */ - @ExcelProperty(value = "登出时间", index = 7) + @ExcelProperty(value = "登出时间", index = 6) private String logoutTime; /** * 指定时间内的,在线时长 */ - @ExcelProperty(value = "在线时长", index = 8) + @ExcelProperty(value = "在线时长", index = 7) private String onlineDuration; /** * 是否在线 */ - @ExcelProperty(value = "是否在线", index = 9) + @ExcelProperty(value = "是否在线", index = 8) private Boolean isOnLine; /** * 登录IP */ - @ExcelProperty(value = "登录IP", index = 10) + @ExcelProperty(value = "登录IP", index = 9) private String ip; /** * IP所属地 */ - @ExcelProperty(value = "IP所属地", index = 11) + @ExcelProperty(value = "IP所属地", index = 10) private String ipAddress; /** * 登录次数 */ - @ExcelProperty(value = "登录次数", index = 12) + @ExcelProperty(value = "登录次数", index = 11) private Integer loginCount; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/StudentUseLogVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/StudentUseLogVO.java index 5932633d..f5b1c870 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/vo/StudentUseLogVO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/StudentUseLogVO.java @@ -45,7 +45,7 @@ public class StudentUseLogVO extends BaseEntity { private String universitiesCollegesName; /** - * 所属平台 + * 所属省份 */ @ExcelProperty(value = "所属省份", index = 3) private String universitiesCollegesProvince; diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md index d252f025..27d18085 100644 --- a/web/src/main/resources/sql/jlw/student.md +++ b/web/src/main/resources/sql/jlw/student.md @@ -1554,7 +1554,6 @@ queryStudentLoginLogByCondition tc.`name`, td.universities_colleges_name, td.universities_colleges_province, - ta.ip, td.class_name ) z @@ -1663,12 +1662,14 @@ queryStudentLogAnalysisByCondition * 日志分析,统计报表 SELECT - @// 日期 - DATE_FORMAT(ta.create_time, '%Y-%m-%d') as date_str, - te.universities_colleges_name, - te.universities_colleges_province, - count( 1 ) AS login_count, - count( DISTINCT ta.user_id ) AS on_line_count + @pageTag() { + @// 日期 + 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 + @} FROM sys_log ta LEFT JOIN student t ON ta.user_id = t.user_id