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 page = studentTeacherSystemUseLogAnalysisService.applicationUseLogsAnalysis(condition.getPageQuery());