From 6ad9c778d138d0806966ce044dd4ee2ee46d2ea2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 16:56:52 +0800
Subject: [PATCH] 分局预警接口修改

---
 src/main/java/org/springblade/modules/information/controller/InformationsController.java |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/controller/InformationsController.java b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
index 922df69..d21b8a6 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationsController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
@@ -149,6 +149,32 @@
 		//辖区信息
 		List<Map<Object, Object>> list = informationService.selectJur();
 		List<Map<String, Object>> lists = new ArrayList<>();
+
+		//1.保安员表现差预警数量
+		List<ResponseVo> performanceGroupCountList = informationService.getSecurityPerformanceGroupCountList();
+		System.out.println("保安员表现差预警数量 = " + performanceGroupCountList);
+
+		//2.保安员资格异常的数量
+		List<ResponseVo> examinationGroupCountList = informationService.getSecurityExaminationGroupCountList();
+		System.out.println("保安员资格异常的数量 = " + examinationGroupCountList);
+
+		//3.考试通过率低于50%
+		List<ResponseVo> examPassingGroupCountList = informationService.getSecurityExamPassingGroupCountList();
+		System.out.println("考试通过率低于50% = " + examPassingGroupCountList);
+
+		//4.持证率低于50%
+		List<ResponseVo> holdGroupCountList = informationService.getSecurityHoldAndSoidAndDispatchGroupCountList(1);
+		System.out.println("持证率低于50% = " + holdGroupCountList);
+
+		//5.社保缴纳率低于50%
+		List<ResponseVo> soidGroupCountList = informationService.getSecurityHoldAndSoidAndDispatchGroupCountList(2);
+		System.out.println("社保缴纳率低于50% = " + soidGroupCountList);
+
+		//6.派遣率低于50%
+		List<ResponseVo> dispatchGroupCountList = informationService.getSecurityHoldAndSoidAndDispatchGroupCountList(3);
+		System.out.println("派遣率低于50% = " + dispatchGroupCountList);
+
+
 		for (int i = 0; i < list.size(); i++) {
 			int count = 0;
 			Map<String, Object> map = new HashMap<String, Object>();
@@ -156,9 +182,8 @@
 			String id = list.get(i).get("id").toString();
 			//辖区名称
 			String jurname = list.get(i).get("dept_name").toString();
+
 			//1.保安员表现差预警数量
-			List<ResponseVo> performanceGroupCountList = informationService.getSecurityPerformanceGroupCountList();
-			System.out.println("保安员表现差预警数量 = " + performanceGroupCountList);
 			//遍历计算总数
 			for (ResponseVo responseVo : performanceGroupCountList) {
 				//辖区id相同则数量相加
@@ -169,8 +194,6 @@
 
 
 			//2.保安员资格异常的数量
-			List<ResponseVo> examinationGroupCountList = informationService.getSecurityExaminationGroupCountList();
-			System.out.println("保安员资格异常的数量 = " + examinationGroupCountList);
 			//遍历计算总数
 			for (ResponseVo responseVo : examinationGroupCountList) {
 				//辖区id相同则数量相加
@@ -180,8 +203,6 @@
 			}
 
 			//3.考试通过率低于50%
-			List<ResponseVo> examPassingGroupCountList = informationService.getSecurityExamPassingGroupCountList();
-			System.out.println("考试通过率低于50% = " + examPassingGroupCountList);
 			//遍历计算总数
 			for (ResponseVo responseVo : examPassingGroupCountList) {
 				//辖区id相同则数量相加
@@ -191,8 +212,6 @@
 			}
 
 			//4.持证率低于50%
-			List<ResponseVo> holdGroupCountList = informationService.getSecurityHoldAndSoidAndDispatchGroupCountList(1);
-			System.out.println("持证率低于50% = " + holdGroupCountList);
 			//遍历计算总数
 			for (ResponseVo responseVo : holdGroupCountList) {
 				//辖区id相同则数量相加
@@ -202,8 +221,6 @@
 			}
 
 			//5.社保缴纳率低于50%
-			List<ResponseVo> soidGroupCountList = informationService.getSecurityHoldAndSoidAndDispatchGroupCountList(2);
-			System.out.println("社保缴纳率低于50% = " + soidGroupCountList);
 			//遍历计算总数
 			for (ResponseVo responseVo : soidGroupCountList) {
 				//辖区id相同则数量相加
@@ -213,8 +230,6 @@
 			}
 
 			//6.派遣率低于50%
-			List<ResponseVo> dispatchGroupCountList = informationService.getSecurityHoldAndSoidAndDispatchGroupCountList(3);
-			System.out.println("派遣率低于50% = " + dispatchGroupCountList);
 			//遍历计算总数
 			for (ResponseVo responseVo : dispatchGroupCountList) {
 				//辖区id相同则数量相加

--
Gitblit v1.9.3