Merge branch 'dev'
This commit is contained in:
commit
dd957414d8
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue