From 9bfd0f697d407902d9d80d95e5c23943a556b79f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 10 三月 2023 13:38:14 +0800
Subject: [PATCH] mysql5.7不能使用 with
---
ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java b/ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java
index 86f2ecf..506d508 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java
@@ -66,13 +66,13 @@
startTime = beginTime.format(fmt);
}
if (endTime != null){
- endTime1 = beginTime.format(fmt);
+ endTime1 = endTime.format(fmt);
}
IPage<UnlawfulDto> page = new Page<>();
List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByType((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
- page.setTotal(unlawfulByType.size());
+ page.setTotal(unlawfulService.getTotalByType(startTime, endTime1));
page.setRecords(unlawfulByType);
return CommonResult.success(page);
}
@@ -91,12 +91,12 @@
startTime = beginTime.format(fmt);
}
if (endTime != null){
- endTime1 = beginTime.format(fmt);
+ endTime1 = endTime.format(fmt);
}
IPage<UnlawfulDto> page = new Page<>();
List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulBySite((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
- page.setTotal(unlawfulByType.size());
+ page.setTotal(unlawfulService.getTotalBySite(startTime, endTime1));
page.setRecords(unlawfulByType);
return CommonResult.success(page);
}
@@ -115,12 +115,11 @@
startTime = beginTime.format(fmt);
}
if (endTime != null){
- endTime1 = beginTime.format(fmt);
+ endTime1 = endTime.format(fmt);
}
IPage<UnlawfulDto> page = new Page<>();
List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByTime((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
-
- page.setTotal(unlawfulByType.size());
+ page.setTotal(unlawfulService.getTotalByTime(startTime, endTime1));
page.setRecords(unlawfulByType);
return CommonResult.success(page);
}
@@ -139,12 +138,12 @@
startTime = beginTime.format(fmt);
}
if (endTime != null){
- endTime1 = beginTime.format(fmt);
+ endTime1 = endTime.format(fmt);
}
IPage<UnlawfulDto> page = new Page<>();
- List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulBySite((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
+ List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByStreet((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
- page.setTotal(unlawfulByType.size());
+ page.setTotal(unlawfulService.getTotalByStreet(startTime, endTime1));
page.setRecords(unlawfulByType);
return CommonResult.success(page);
}
@@ -208,6 +207,14 @@
EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulBySiteExport);
}
+ @PostMapping("/export/unlawful/time")
+ @ApiOperation("鎸夋姤璀︾偣浣嶇粺璁℃柟寮�-瀵煎嚭")
+ public void exportTime(HttpServletResponse response) {
+ List<UnlawfulDto> unlawfulBySiteExport = unlawfulService.getUnlawfulByTimeExport();
+ String sheetName = "鎸夋姤璀︾偣浣嶇粺璁℃柟寮�";
+ EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulBySiteExport);
+ }
+
/*@PostMapping("/export/shop")
@ApiOperation("闂ㄥ墠涓夊寘-瀵煎嚭")
public void exportShop(HttpServletResponse response) {
--
Gitblit v1.8.0