Merge branch 'dev'
This commit is contained in:
commit
2b599faa4a
|
@ -919,7 +919,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
item.setValue(index.get("total"));
|
item.setValue(index.get("total"));
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
map1.put("0", ((int) map1.get("0")) + (deptCount - map1.values().stream().mapToInt(index -> (int) index).sum()));
|
final int[] sum = {0};
|
||||||
|
map1.values().forEach(index -> {
|
||||||
|
sum[0] = sum[0] + Integer.parseInt(index.toString());
|
||||||
|
});
|
||||||
|
map1.put("0", (Integer.valueOf(map1.get("0").toString())) + (deptCount - sum[0]));
|
||||||
resultMap.put("deptTotalCount", map1);
|
resultMap.put("deptTotalCount", map1);
|
||||||
return resultMap;
|
return resultMap;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue