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 ffe20c24..0468bbd4 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 @@ -1,5 +1,6 @@ package org.jeecg.modules.kc.jiaoshi.export; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.beust.jcommander.internal.Sets; @@ -271,9 +272,11 @@ public class Export extends BaseExport { } List mainLogList = kcZhihuijiaoshiMonitorLogService.list(mainQw); if(mainLogList.isEmpty()){ -// String today= DateUtil.today(); +// String today = DateUtil.today(); + String now = DateUtil.now(); result.put("监测时间", kcZhihuijiaoshiMonitorLog.getStartTime() + " - " + kcZhihuijiaoshiMonitorLog.getEndTime()); result.put("监测教学楼", kcZhihuijiaoshiMonitorLog.getJxlName()); + result.put("打印时间",now); result.put("教学楼数", "0"); result.put("教室数", "0"); result.put("大节数", "0"); @@ -447,11 +450,14 @@ public class Export extends BaseExport { //********************************取数据END*********************************************************/ //********************************通用*************************************************************/ // String today= DateUtil.today(); + String now = DateUtil.now(); result.put("监测时间", kcZhihuijiaoshiMonitorLog.getStartTime() + " - " + kcZhihuijiaoshiMonitorLog.getEndTime()); result.put("监测教学楼", kcZhihuijiaoshiMonitorLog.getJxlName()); + result.put("打印时间",now); result.put("教学楼数", String.valueOf(jxls)); result.put("教室数", String.valueOf(jss)); - result.put("大节数", String.valueOf(djs)); + //result.put("大节数", String.valueOf(djs)); + result.put("大节数", String.valueOf(zckts + yckts)); result.put("运行正常课堂", String.valueOf(zckts)); result.put("运行异常课堂", String.valueOf(yckts)); result.put("正常率", String.valueOf(zcl.floatValue())); diff --git a/jeecg-module-main/src/main/resources/officetemplates/exp1/zhjs-tjfxbg.docx b/jeecg-module-main/src/main/resources/officetemplates/exp1/zhjs-tjfxbg.docx index d320935c..ad05da63 100644 --- a/jeecg-module-main/src/main/resources/officetemplates/exp1/zhjs-tjfxbg.docx +++ b/jeecg-module-main/src/main/resources/officetemplates/exp1/zhjs-tjfxbg.docx @@ -2,6 +2,7 @@ 一、总体情况 监测时间:{监测时间} 监测教学楼:{监测教学楼} + 打印时间:{打印时间} 在监测时间段内,开课前15分钟开始,每间隔15分钟对线上开放课堂进行直播状态监测。本监测时间段内共{教学楼数}个教学楼{教室数}间教室提供线上开放课堂{大节数}大节,运行正常课堂{运行正常课堂}大节,{运行异常课堂}大节课堂监测异常,线上开放课堂运行正常率为{正常率}%。 线上开放课堂运行情况一览表 教学楼