From 887fa43014ffb937c4b2dc5f65bb5338fde7dfd0 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 22 Mar 2023 23:57:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=A2=E6=A0=A1=E4=BD=BF=E7=94=A8=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/entity/vo/SystemUseLogsAnalysisVO.java    | 14 ++++++++------
 .../sql/jlw/studentTeacherSystemUseLogAnalysis.md | 15 ++++++++-------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/SystemUseLogsAnalysisVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/SystemUseLogsAnalysisVO.java
index b8755570..4d0526ef 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/vo/SystemUseLogsAnalysisVO.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/SystemUseLogsAnalysisVO.java
@@ -3,6 +3,8 @@ package com.ibeetl.jlw.entity.vo;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 功能描述: <br>
  * 子系统应用，使用时间的统计分析实体
@@ -17,11 +19,11 @@ public class SystemUseLogsAnalysisVO extends BaseEntity {
     /**
      * 日志名称（原型图上写的是子系统名称，其实不是）
      */
-    private String name;
+    private String secondName;
     /**
      * 归属模块
      */
-    private String courseLabelType;
+    private String firstName;
     /**
      * 院校名称
      */
@@ -39,12 +41,12 @@ public class SystemUseLogsAnalysisVO extends BaseEntity {
      */
     private Long usePeopleCount;
     /**
-     * 使用时长
+     * 使用总时长
      */
-    private String useDuration;
+    private Long sumUseDuration;
     /**
-     * 使用总时间
+     * 使用日期
      */
-    private String useTotalDuration;
+    private Date dayTime;
 
 }
diff --git a/web/src/main/resources/sql/jlw/studentTeacherSystemUseLogAnalysis.md b/web/src/main/resources/sql/jlw/studentTeacherSystemUseLogAnalysis.md
index 37aa97e9..29120d2b 100644
--- a/web/src/main/resources/sql/jlw/studentTeacherSystemUseLogAnalysis.md
+++ b/web/src/main/resources/sql/jlw/studentTeacherSystemUseLogAnalysis.md
@@ -511,13 +511,14 @@ applicationUseLogsAnalysis
 
   select
   @pageTag(){
-  first_name,
-  second_name,
-  universities_colleges_name,
-  universities_colleges_id,
-  province,
-  day_time,
-  sum(use_duration) as sum_use_duration
+  first_name,                                 -- 一级名称（原型图中的子系统名称）
+  second_name,                                -- 二级名称（所属模块） 
+  universities_colleges_name,                 -- 院校名称
+  universities_colleges_id,                   -- 院校ID
+  province,                                   -- 院校省份
+  day_time,                                   -- 使用日期
+  sum(use_duration) as sum_use_duration,      -- 使用总时长
+  count(distinct user_id) as use_people_count -- 使用人数
   @}
   from student_teacher_system_use_log_analysis t
   where 1=1