From 98f8d438a976d73e7c4f6434efc8867ebe2a07a5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 05 Nov 2021 17:35:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index f8c65b5..0efc721 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -855,8 +855,8 @@
* 保安员统计
*/
@PostMapping("/selectLi")
- public R<IPage> selectLi(String jurisdiction, String deptid, String stats, Query query) {
- IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid, stats);
+ public R<IPage> selectLi(String jurisdiction, String deptid, String stats,String startTime,String endTime, Query query) {
+ IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid, stats,startTime,endTime);
return R.data(list);
}
@@ -1567,9 +1567,9 @@
* 业务统计情况
*/
@PostMapping("/selectYw")
- public R<IPage> selectYw(String jurisdiction, String deptid, String stats, Query query) {
+ public R<IPage> selectYw(String jurisdiction, String deptid, String stats,String startTime,String endTime,Query query) {
if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
- IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid, stats);
+ IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid, stats,startTime,endTime);
return R.data(list);
} else {
String childer = informationService.selJurchilder(jurisdiction);
@@ -1579,7 +1579,7 @@
strArrays += "'" + split[j] + "',";
}
String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
- IPage list = informationService.selectYw(Condition.getPage(query), jurisdictiond, deptid, stats);
+ IPage list = informationService.selectYw(Condition.getPage(query), jurisdictiond, deptid, stats,startTime,endTime);
return R.data(list);
}
}
--
Gitblit v1.9.3