Merge branch 'dev'
This commit is contained in:
commit
719484fad7
|
@ -886,7 +886,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
@Override
|
@Override
|
||||||
public Object selectSourceDepartmentStatistics() {
|
public Object selectSourceDepartmentStatistics() {
|
||||||
HashMap<String, Object> resultMap = new HashMap<>();
|
HashMap<String, Object> resultMap = new HashMap<>();
|
||||||
long deptCount = resourceDao.selectDeptCount();
|
int deptCount = resourceDao.selectDeptCount();
|
||||||
resultMap.put("deptCount", deptCount);
|
resultMap.put("deptCount", deptCount);
|
||||||
HashMap<String, Object> map = new HashMap() {
|
HashMap<String, Object> map = new HashMap() {
|
||||||
{
|
{
|
||||||
|
@ -919,7 +919,7 @@ 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()));
|
map1.put("0", ((int) map1.get("0")) + (deptCount - map1.values().stream().mapToInt(index -> (int) index).sum()));
|
||||||
resultMap.put("deptTotalCount", map1);
|
resultMap.put("deptTotalCount", map1);
|
||||||
return resultMap;
|
return resultMap;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue