From 3516f02277035cdc7ff137422709b16efe97ca4a Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期五, 27 八月 2021 11:27:21 +0800
Subject: [PATCH] 8.27

---
 src/main/java/com/hxzkoa/services/AttendanceService.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/hxzkoa/services/AttendanceService.java b/src/main/java/com/hxzkoa/services/AttendanceService.java
index 2bad207..948a2d3 100644
--- a/src/main/java/com/hxzkoa/services/AttendanceService.java
+++ b/src/main/java/com/hxzkoa/services/AttendanceService.java
@@ -134,19 +134,19 @@
 		List resultList = query.getResultList();
 		Map<String, Integer> reMap = new HashMap<String, Integer>();
 		int realAttendanceCount = getRealAttendanceCount();
-		if (resultList.size() > 3) {
-			for (int i = 0; i < 3; i++) {
-				Object[] obj = (Object[]) resultList.get(i);
-				reMap.put(obj[0].toString(), Integer.parseInt(obj[1].toString()));
-				realAttendanceCount = realAttendanceCount - Integer.parseInt(obj[1].toString());
-			}
-			reMap.put("鍏朵粬", realAttendanceCount);
-		} else {
+//		if (resultList.size() > 3) {
+//			for (int i = 0; i < 3; i++) {
+//				Object[] obj = (Object[]) resultList.get(i);
+//				reMap.put(obj[0].toString(), Integer.parseInt(obj[1].toString()));
+//				realAttendanceCount = realAttendanceCount - Integer.parseInt(obj[1].toString());
+//			}
+//			reMap.put("鍏朵粬", realAttendanceCount);
+//		} else {
 			for (int i = 0; i < resultList.size(); i++) {
 				Object[] obj = (Object[]) resultList.get(i);
 				reMap.put(obj[0].toString(), Integer.parseInt(obj[1].toString()));
 			}
-		}
+//		}
 		return reMap;
 	}
 
@@ -357,29 +357,29 @@
 			rMap.add(obj[0].toString());
 			reMap.add(Integer.parseInt(obj[1].toString()));
 		}
-		List<Integer> raMap = new ArrayList<Integer>();
-		for (int i = resultList.size()-1; i >= 0; i--) {
-			raMap.add(reMap.get(i));
-		}
 		List<Object> zong = new ArrayList<Object>();
 		zong.add(rMap);
 		zong.add(reMap);
 		return zong;
 	}
 	
-	public List<Integer> getgongzhongnum(){
+	public List<Object> getgongzhongnum(){
 		String sql = null;
 		Query query = null;
 		sql = "SELECT bumen,num FROM tb_gongzhong";
 		query = this.em.createNativeQuery(sql);
 		List resultList = query.getResultList();
+		List<String> gongzhongk = new ArrayList<String>();
 		List<Integer> gongzhong = new ArrayList<Integer>();
 		for (int i = resultList.size()-1; i >= 0; i--) {
 			Object[] obj = (Object[]) resultList.get(i);
+			gongzhongk.add(obj[0].toString());
 			gongzhong.add(Integer.parseInt(obj[1].toString()));
 		}
-		System.out.print(gongzhong);
-		return gongzhong;
+		List<Object> zong = new ArrayList<Object>();
+		zong.add(gongzhongk);
+		zong.add(gongzhong);
+		return zong;
 	}
 	
 	public List<Integer> getgaojingnum(){

--
Gitblit v1.10.0