yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年11月13日 修改统计范围

This commit is contained in:
bai 2023-11-13 11:48:58 +08:00
parent cef411f7de
commit a2484cfedf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/export/Export.java
View File

@ -205,14 +205,14 @@ public class Export extends BaseExport {
QueryWrapper<KcZhihuijiaoshiMonitorLog> mainQw = new QueryWrapper<>(); QueryWrapper<KcZhihuijiaoshiMonitorLog> mainQw = new QueryWrapper<>();
mainQw.isNotNull("kt_id"); mainQw.isNotNull("kt_id");
mainQw.ge(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getStartTime()),"create_time",kcZhihuijiaoshiMonitorLog.getStartTime()); 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())){ if(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getJxlName())){
mainQw.in("jxl_name", Arrays.asList(StringUtils.split(kcZhihuijiaoshiMonitorLog.getJxlName(),","))); mainQw.in("jxl_name", Arrays.asList(StringUtils.split(kcZhihuijiaoshiMonitorLog.getJxlName(),",")));
} }
List<KcZhihuijiaoshiMonitorLog> mainLogList = kcZhihuijiaoshiMonitorLogService.list(mainQw); List<KcZhihuijiaoshiMonitorLog> mainLogList = kcZhihuijiaoshiMonitorLogService.list(mainQw);
if(mainLogList.isEmpty()){ if(mainLogList.isEmpty()){
String today= DateUtil.today(); // String today= DateUtil.today();
result.put("监测时间", today); result.put("监测时间", kcZhihuijiaoshiMonitorLog.getStartTime() + "-" + kcZhihuijiaoshiMonitorLog.getEndTime());
result.put("监测教学楼", kcZhihuijiaoshiMonitorLog.getJxlName()); result.put("监测教学楼", kcZhihuijiaoshiMonitorLog.getJxlName());
result.put("教学楼数", "0"); result.put("教学楼数", "0");
result.put("教室数", "0"); result.put("教室数", "0");
@ -326,8 +326,8 @@ public class Export extends BaseExport {
//********************************取数据END*********************************************************/ //********************************取数据END*********************************************************/
//********************************通用*************************************************************/ //********************************通用*************************************************************/
String today= DateUtil.today(); // String today= DateUtil.today();
result.put("监测时间", today); result.put("监测时间", kcZhihuijiaoshiMonitorLog.getStartTime() + "-" + kcZhihuijiaoshiMonitorLog.getEndTime());
result.put("监测教学楼", kcZhihuijiaoshiMonitorLog.getJxlName()); result.put("监测教学楼", kcZhihuijiaoshiMonitorLog.getJxlName());
result.put("教学楼数", String.valueOf(jxls)); result.put("教学楼数", String.valueOf(jxls));
result.put("教室数", String.valueOf(jss)); result.put("教室数", String.valueOf(jss));