Compare commits
No commits in common. "a7d497fdbbdb4181f8822dfcaa78b2ebd00d2011" and "4a91e17e5ee6a4ae112ee1093d7477ff030d482f" have entirely different histories.
a7d497fdbb
...
4a91e17e5e
|
@ -2444,7 +2444,6 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
countMap.put("sjzy", 0);
|
countMap.put("sjzy", 0);
|
||||||
countMap.put("yzy", 0);
|
countMap.put("yzy", 0);
|
||||||
countMap.put("ysp", 0);
|
countMap.put("ysp", 0);
|
||||||
countMap.put("hys", 0); // 填充会议室为0
|
|
||||||
typeCountListMap.forEach((k, v) -> {
|
typeCountListMap.forEach((k, v) -> {
|
||||||
HashMap<Object, Object> map = new HashMap<>();
|
HashMap<Object, Object> map = new HashMap<>();
|
||||||
map.put("count", v.stream().mapToInt(it -> Integer.parseInt(it.get("count").toString())).sum());
|
map.put("count", v.stream().mapToInt(it -> Integer.parseInt(it.get("count").toString())).sum());
|
||||||
|
@ -2457,9 +2456,6 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
map.put("jcss", "0");
|
map.put("jcss", "0");
|
||||||
map.put("zsk", "0");
|
map.put("zsk", "0");
|
||||||
map.put("sjzy", "0");
|
map.put("sjzy", "0");
|
||||||
map.put("yzy", "0");
|
|
||||||
map.put("ysp", "0");
|
|
||||||
map.put("hys", "0");
|
|
||||||
v.forEach(item -> {
|
v.forEach(item -> {
|
||||||
map.put(item.get("type").toString(), item.get("count"));
|
map.put(item.get("type").toString(), item.get("count"));
|
||||||
if (countMap.containsKey(item.get("type"))) {
|
if (countMap.containsKey(item.get("type"))) {
|
||||||
|
|
Loading…
Reference in New Issue