From 3e6824c089291d1672eb97ce9f6f8e18841ee874 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 17 Sep 2021 10:51:08 +0800
Subject: [PATCH] 1.用户
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 b68532b..5468e92 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -1109,12 +1109,12 @@
//交社保数
String numjs = mapsb.get(isb).get("numj").toString();
Integer numj = Integer.parseInt(numjs);
- //单位总人数
- String numzs = mapsb.get(isb).get("numz").toString();
- Integer numz = Integer.parseInt(numzs);
- //统计未交社保人数
- int i1 = numz - numj;
- count += i1;
+// //单位总人数
+// String numzs = mapsb.get(isb).get("numz").toString();
+// Integer numz = Integer.parseInt(numzs);
+// //统计未交社保人数
+// int i1 = numz - numj;
+ count += numj;
}
map.put("Count", count);
map.put("jurname", jurname);
@@ -1146,21 +1146,24 @@
}
String deptid = strArrays.substring(0, strArrays.length() - 1);
Map<String, Object> map = new HashMap<String, Object>();
- Map<Object, Object> objectStringMap = iDeptService.selectHold(deptid);
- if (objectStringMap == null) {
+ List<Map<String, Object>> objectStringMap = iDeptService.selectHold(deptid);
+ if (objectStringMap.size()==0) {
map.put("name", list.get(i).get("deptname"));
map.put("cz", cznumber);
map.put("wcz", wcznumber);
lists.add(map);
} else {
- String cz = objectStringMap.get("cz").toString();
- cznumber = Integer.valueOf(cz);
- String wcz = objectStringMap.get("wcz").toString();
- wcznumber = Integer.valueOf(wcz);
+ for (int c=0;c<objectStringMap.size();c++){
+ String cz = objectStringMap.get(c).get("cz").toString();
+ cznumber += Integer.valueOf(cz);
+ String wcz = objectStringMap.get(c).get("wcz").toString();
+ wcznumber += Integer.valueOf(wcz);
+ }
map.put("name", list.get(i).get("deptname"));
map.put("cz", cznumber);
map.put("wcz", wcznumber);
lists.add(map);
+
}
}
return R.data(lists);
--
Gitblit v1.9.3