From bc131131c5c96f8cb3bed679d4a359820c22e335 Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期四, 17 三月 2022 09:38:47 +0800
Subject: [PATCH] 3.17

---
 src/main/java/com/hxzkoa/controller/ShowController.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hxzkoa/controller/ShowController.java b/src/main/java/com/hxzkoa/controller/ShowController.java
index 28850dd..ed5d3bb 100644
--- a/src/main/java/com/hxzkoa/controller/ShowController.java
+++ b/src/main/java/com/hxzkoa/controller/ShowController.java
@@ -286,9 +286,22 @@
 	
 	@RequestMapping(value = "/setgaojingnum.do", method = { RequestMethod.POST, RequestMethod.GET })
 	@ResponseBody
-	public List<Integer> setgaojingnum(){
-		List<Integer> gaojingnum = attendanceService.getgaojingnum();
-		return gaojingnum;
+	public JSONObject setgaojingnum(){
+//		List<Integer> gaojingnum = attendanceService.getgaojingnum();
+//		return gaojingnum;
+		JSONObject jsons = new JSONObject();
+		Map warningSummaryTypeMap = warningService.getWarningSummaryType();
+		List<String> reWarningSummary_k = new ArrayList<String>();
+		List<Integer> reWarningSummary_v = new ArrayList<Integer>();
+		Iterator<String> warningSummaryTypeIter = warningSummaryTypeMap.keySet().iterator();
+		while (warningSummaryTypeIter.hasNext()) {
+			String key = warningSummaryTypeIter.next();
+			reWarningSummary_k.add(key);
+			reWarningSummary_v.add((int) warningSummaryTypeMap.get(key));
+		}
+		jsons.put("key", reWarningSummary_k);
+		jsons.put("value", reWarningSummary_v);
+		return jsons;
 	}
 	
 }

--
Gitblit v1.10.0