Merge branch 'dev'
This commit is contained in:
commit
02893504fc
|
@ -2114,7 +2114,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
List<HashMap<String, Object>> temp = typeCountListMap2.keySet().stream().map(index_ -> {
|
List<HashMap<String, Object>> temp = typeCountListMap2.keySet().stream().map(index_ -> {
|
||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
typeCountListMap2.get(index_).stream().forEach(count -> {
|
typeCountListMap2.get(index_).stream().forEach(count -> {
|
||||||
map.put(count.get("type").toString(), Integer.parseInt(count.get("type").toString()));
|
map.put(count.get("type").toString(), Integer.parseInt(count.get("count").toString()));
|
||||||
if (countMap.containsKey(count.get("type"))) {
|
if (countMap.containsKey(count.get("type"))) {
|
||||||
countMap.replace(count.get("type").toString(), Integer.parseInt(count.get("count").toString()) + countMap.get(count.get("type")));
|
countMap.replace(count.get("type").toString(), Integer.parseInt(count.get("count").toString()) + countMap.get(count.get("type")));
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue