|
@@ -1,11 +1,6 @@
|
|
|
package com.goafanti.admin.service.impl;
|
|
package com.goafanti.admin.service.impl;
|
|
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
-import java.util.HashMap;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
-import java.util.TreeMap;
|
|
|
|
|
-import java.util.UUID;
|
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
@@ -384,9 +379,12 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
depIds =departmentService.selectSubordinateDeps(depId);
|
|
depIds =departmentService.selectSubordinateDeps(depId);
|
|
|
}
|
|
}
|
|
|
List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime, endTime);
|
|
List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime, endTime);
|
|
|
- for (AdminCustomerBo ad : list) {
|
|
|
|
|
|
|
+ Iterator<AdminCustomerBo> iterator = list.iterator();
|
|
|
|
|
+ while (iterator.hasNext()){
|
|
|
|
|
+ AdminCustomerBo ad=new AdminCustomerBo();
|
|
|
if (acb.getId().equals(ad.getDepId())){
|
|
if (acb.getId().equals(ad.getDepId())){
|
|
|
acb.getaList().add(ad);
|
|
acb.getaList().add(ad);
|
|
|
|
|
+ iterator.remove();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
for (depCountBo dep : deps) {
|
|
for (depCountBo dep : deps) {
|
|
@@ -406,11 +404,14 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
//迭代获取所有部门与部门员工并计算出部门数量
|
|
//迭代获取所有部门与部门员工并计算出部门数量
|
|
|
private List<depCountBo> iterationDeps(String id,List<AdminCustomerBo> list) {
|
|
private List<depCountBo> iterationDeps(String id,List<AdminCustomerBo> list) {
|
|
|
List<depCountBo> deps =departmentMapper.selectBysuperId(id);
|
|
List<depCountBo> deps =departmentMapper.selectBysuperId(id);
|
|
|
|
|
+ Iterator<AdminCustomerBo> iterator = list.iterator();
|
|
|
for (depCountBo dep : deps) {
|
|
for (depCountBo dep : deps) {
|
|
|
dep.setList(iterationDeps(dep.getId(),list));
|
|
dep.setList(iterationDeps(dep.getId(),list));
|
|
|
- for (AdminCustomerBo ad : list) {
|
|
|
|
|
|
|
+ while (iterator.hasNext()){
|
|
|
|
|
+ AdminCustomerBo ad=new AdminCustomerBo();
|
|
|
if (dep.getId().equals(ad.getDepId())){
|
|
if (dep.getId().equals(ad.getDepId())){
|
|
|
dep.getaList().add(ad);
|
|
dep.getaList().add(ad);
|
|
|
|
|
+ iterator.remove();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
sumCount(dep);
|
|
sumCount(dep);
|