From a2484cfedfd22870aaf552522412bdd8f0d45f6e Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Mon, 13 Nov 2023 11:48:58 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=8813=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=9F=E8=AE=A1=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/kc/jiaoshi/export/Export.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/export/Export.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/export/Export.java index e901dc80..75339384 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/export/Export.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/export/Export.java @@ -205,14 +205,14 @@ public class Export extends BaseExport { QueryWrapper mainQw = new QueryWrapper<>(); mainQw.isNotNull("kt_id"); mainQw.ge(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getStartTime()),"create_time",kcZhihuijiaoshiMonitorLog.getStartTime()); - mainQw.le(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getEndTime()),"create_time",kcZhihuijiaoshiMonitorLog.getEndTime()); + mainQw.le(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getEndTime()),"create_time",kcZhihuijiaoshiMonitorLog.getEndTime() + " 23:59:59"); if(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getJxlName())){ mainQw.in("jxl_name", Arrays.asList(StringUtils.split(kcZhihuijiaoshiMonitorLog.getJxlName(),","))); } List mainLogList = kcZhihuijiaoshiMonitorLogService.list(mainQw); if(mainLogList.isEmpty()){ - String today= DateUtil.today(); - result.put("监测时间", today); +// String today= DateUtil.today(); + result.put("监测时间", kcZhihuijiaoshiMonitorLog.getStartTime() + "-" + kcZhihuijiaoshiMonitorLog.getEndTime()); result.put("监测教学楼", kcZhihuijiaoshiMonitorLog.getJxlName()); result.put("教学楼数", "0"); result.put("教室数", "0"); @@ -326,8 +326,8 @@ public class Export extends BaseExport { //********************************取数据END*********************************************************/ //********************************通用*************************************************************/ - String today= DateUtil.today(); - result.put("监测时间", today); +// String today= DateUtil.today(); + result.put("监测时间", kcZhihuijiaoshiMonitorLog.getStartTime() + "-" + kcZhihuijiaoshiMonitorLog.getEndTime()); result.put("监测教学楼", kcZhihuijiaoshiMonitorLog.getJxlName()); result.put("教学楼数", String.valueOf(jxls)); result.put("教室数", String.valueOf(jss));