From 3914c50f559a4d51d39dc293564927729154c466 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 04 Nov 2021 18:59:49 +0800
Subject: [PATCH] 统计查询接口修改
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 0bf1b89..898c922 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -32,6 +32,7 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.vo.InformationVO;
+import org.springblade.modules.information.vo.ResponseVo;
import org.springblade.modules.jurisdiction.service.JurisdictionService;
import org.springblade.modules.jurisdiction.vo.JurisdictionVO;
import org.springblade.modules.system.entity.Dept;
@@ -803,8 +804,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);
}
@@ -1515,9 +1516,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);
@@ -1527,7 +1528,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);
}
}
@@ -1716,7 +1717,6 @@
int sbnum = Integer.parseInt(sbnums);
//保安总人数为0
if (znum == 0) {
- continue;
} else {
int a = znum / 2;
if (cznum <= a || sbnum <= a) {
--
Gitblit v1.9.3