|
|
@@ -9,11 +9,9 @@ import com.goafanti.admin.service.NewAdminService;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.Department;
|
|
|
-import com.goafanti.common.model.Role;
|
|
|
import com.goafanti.common.utils.RedisUtil;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import com.goafanti.admin.bo.AdminContacts;
|
|
|
@@ -393,7 +391,11 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
depIds.add(department);
|
|
|
deps=departmentMapper.selectBysuperId(oo.getId());
|
|
|
}
|
|
|
- List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime, endTime);
|
|
|
+ List<AdminCustomerBo> list =null;
|
|
|
+ //原sql计算
|
|
|
+ list=departmentMapper.AlldepCount(depIds,startTime, endTime);
|
|
|
+ //新java计算
|
|
|
+ list=AllDepCount(depIds,startTime,endTime);
|
|
|
for (AdminCustomerBo ad : list) {
|
|
|
if (acb.getId().equals(ad.getDepId())){
|
|
|
acb.getaList().add(ad);
|
|
|
@@ -413,6 +415,11 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
return acb;
|
|
|
}
|
|
|
|
|
|
+ private List<AdminCustomerBo> AllDepCount(List<Department> depIds, String startTime, String endTime) {
|
|
|
+
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
//迭代获取所有部门与部门员工并计算出部门数量
|
|
|
public List<DepCountBo> iterationDeps(String id,List<AdminCustomerBo> list) {
|
|
|
List<DepCountBo> deps =departmentMapper.selectBysuperId(id);
|