From e0707ca13cfcfcbabd8767cb7e2e315822e5c945 Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Wed, 19 Jul 2023 10:43:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8-?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=83=85=E5=86=B5=E7=BB=9F=E8=AE=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8-=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...entTeacherSystemUseLogAnalysisController.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentTeacherSystemUseLogAnalysisController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentTeacherSystemUseLogAnalysisController.java
index c904ef24..804533ca 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/StudentTeacherSystemUseLogAnalysisController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/StudentTeacherSystemUseLogAnalysisController.java
@@ -3,6 +3,7 @@ package com.ibeetl.jlw.web;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.unit.DataUnit;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.GetFile;
 import cn.jlw.Interceptor.RFile;
@@ -428,6 +429,13 @@ public class StudentTeacherSystemUseLogAnalysisController extends BaseController
     @PostMapping(MODEL + "/applicationUseLogsAnalysis.json")
     @ResponseBody
     public JsonResult applicationUseLogsAnalysis(SystemUseLogsAnalysisDTO dto, @SCoreUser CoreUser coreUser) {
+        if (ObjectUtil.isNotEmpty(dto.getStartDayTime())){
+            dto.setStartDayTime(DateUtil.beginOfDay(dto.getStartDayTime()));
+        }
+
+        if (ObjectUtil.isNotEmpty(dto.getEndDayTime())){
+            dto.setEndDayTime(DateUtil.endOfDay(dto.getEndDayTime()));
+        }
         return JsonResult.success(studentTeacherSystemUseLogAnalysisService.applicationUseLogsAnalysis(dto.getPageQuery()));
     }
 
@@ -445,6 +453,14 @@ public class StudentTeacherSystemUseLogAnalysisController extends BaseController
     public String applicationUseLogsAnalysisExport(SystemUseLogsAnalysisDTO condition, @SCoreUser CoreUser coreUser) throws IOException {
         Assert.isFalse(coreUser.isStudent(), "暂无权限访问！");
 
+        if (ObjectUtil.isNotEmpty(condition.getStartDayTime())){
+            condition.setStartDayTime(DateUtil.beginOfDay(condition.getStartDayTime()));
+        }
+
+        if (ObjectUtil.isNotEmpty(condition.getEndDayTime())){
+            condition.setEndDayTime(DateUtil.endOfDay(condition.getEndDayTime()));
+        }
+
         condition.setPage(1); condition.setLimit(Integer.MAX_VALUE + 0L);
         PageQuery<SystemUseLogsAnalysisVO> page = studentTeacherSystemUseLogAnalysisService.applicationUseLogsAnalysis(condition.getPageQuery());