From 9864c58c9372d4a29da37268329611bac80aac31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 14 Aug 2021 14:52:30 +0800
Subject: [PATCH] 1.统计接口调整

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 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 0e0871a..68d9757 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -605,16 +605,19 @@
 	}
 
 
-
 	/**
 	 * 统计保安员资格异常的数量
+	 * @param jurisdiction
+	 * @param deptid
+	 * @param type 1:当天  2:当月 3:全部
+	 * @return
 	 */
 	@PostMapping("/selectExtype")
-	public R selectExtype(String jurisdiction,String deptid) {
+	public R selectExtype(String jurisdiction,String deptid,String type) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		Integer count=0;
 		List<Map<String, Object>> lists = new ArrayList<>();
-		List<Map<Object, Object>> maps = informationService.selectExtype(jurisdiction, deptid);
+		List<Map<Object, Object>> maps = informationService.selectExtype(jurisdiction, deptid,type);
 		for (int i=0;i<maps.size();i++){
 			String num = maps.get(i).get("num").toString();
 			count+= Integer.valueOf(num);
@@ -625,15 +628,20 @@
 		return R.data(lists);
 	}
 
+
 	/**
 	 * 统计保安员表现差的数量
+	 * @param jurisdiction
+	 * @param deptid
+	 * @param type 1:当天  2:当月 3:全部
+	 * @return
 	 */
 	@PostMapping("/selectBx")
-	public R selectBx(String jurisdiction,String deptid) {
+	public R selectBx(String jurisdiction,String deptid,String type) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		Integer count=0;
 		List<Map<String, Object>> lists = new ArrayList<>();
-		List<Map<Object, Object>> maps = informationService.selectBx(jurisdiction, deptid);
+		List<Map<Object, Object>> maps = informationService.selectBx(jurisdiction, deptid,type);
 		for (int i=0;i<maps.size();i++){
 			String num = maps.get(i).get("num").toString();
 			count+= Integer.valueOf(num);
@@ -663,13 +671,13 @@
 			//辖区名称
 			String jurname = list.get(i).get("dept_name").toString();
 			//保安员表现差预警数量
-			List<Map<Object, Object>> mapbx = informationService.selectBx(jurisdiction, "");
+			List<Map<Object, Object>> mapbx = informationService.selectBx(jurisdiction, "","");
 			for (int ibx=0;ibx<mapbx.size();ibx++){
 				String num = mapbx.get(ibx).get("num").toString();
 				count+= Integer.valueOf(num);
 			}
 			//保安员资格异常的数量
-			List<Map<Object, Object>> mapEx = informationService.selectExtype(jurisdiction, "");
+			List<Map<Object, Object>> mapEx = informationService.selectExtype(jurisdiction, "","");
 			for (int iex=0;iex<mapEx.size();iex++){
 				String num = mapEx.get(iex).get("num").toString();
 				count+= Integer.valueOf(num);

--
Gitblit v1.9.3