Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-13 20:21:54 +08:00
commit dd957414d8
1 changed files with 3 additions and 1 deletions

View File

@ -886,7 +886,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
@Override
public Object selectSourceDepartmentStatistics() {
HashMap<String, Object> resultMap = new HashMap<>();
resultMap.put("deptCount", resourceDao.selectDeptCount());
long deptCount = resourceDao.selectDeptCount();
resultMap.put("deptCount", deptCount);
HashMap<String, Object> map = new HashMap() {
{
put("省级", "0");
@ -918,6 +919,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
item.setValue(index.get("total"));
}
}));
map1.put("0", (long) map.get("0") + map1.values().stream().mapToLong(index -> (long) index).sum());
resultMap.put("deptTotalCount", map1);
return resultMap;
}