|
|
@@ -46,6 +46,8 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
@Autowired
|
|
|
private UserBusinessMapper userBusinessMapper;
|
|
|
@Autowired
|
|
|
+ private UserMapper userMapper;
|
|
|
+ @Autowired
|
|
|
private DepartmentMapper departmentMapper;
|
|
|
@Autowired
|
|
|
private DepartmentService departmentService;
|
|
|
@@ -383,7 +385,6 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
if(TokenManager.hasRole(AFTConstants.OPERATION_MANAGER)){
|
|
|
List<String> myShiroDep = departmentService.selectMyDeps();
|
|
|
if (!myShiroDep.contains(depId))throw new BusinessException("无权查看此部门信息");
|
|
|
-
|
|
|
}
|
|
|
depIds =departmentService.selectSubordinateDeps(depId);
|
|
|
Department department = new Department();
|
|
|
@@ -393,7 +394,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
}
|
|
|
List<AdminCustomerBo> list =null;
|
|
|
//原sql计算
|
|
|
- list=departmentMapper.AlldepCount(depIds,startTime, endTime);
|
|
|
+// list=departmentMapper.AlldepCount(depIds,startTime, endTime);
|
|
|
//新java计算
|
|
|
list=AllDepCount(depIds,startTime,endTime);
|
|
|
for (AdminCustomerBo ad : list) {
|
|
|
@@ -416,8 +417,30 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
}
|
|
|
|
|
|
private List<AdminCustomerBo> AllDepCount(List<Department> depIds, String startTime, String endTime) {
|
|
|
-
|
|
|
- return null;
|
|
|
+ List<AdminCustomerBo> admins = adminMapper.selectByDeps(depIds);
|
|
|
+ List<AdminCustomerBo> users = userMapper.selectNoChannelByaids(admins,startTime,endTime);
|
|
|
+ List<AdminCustomerBo> users2 = userMapper.selectChannelByaids(admins,startTime,endTime);
|
|
|
+ for (AdminCustomerBo admin : admins) {
|
|
|
+ for (AdminCustomerBo user : users) {
|
|
|
+ if (admin.getAid().equals(user.getAid())){
|
|
|
+ admin.setUserCount(user.getUserCount());
|
|
|
+ admin.setChannelCount(user.getChannelCount());
|
|
|
+ admin.setSignCount(user.getSignCount());
|
|
|
+ admin.setNewCount(user.getNewCount());
|
|
|
+ admin.setChannelNewCount(user.getChannelNewCount());
|
|
|
+ admin.setReceiveCount(user.getReceiveCount());
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (AdminCustomerBo user : users2) {
|
|
|
+ if (admin.getAid().equals(user.getAid())){
|
|
|
+ admin.setCompleteCount(user.getCompleteCount());
|
|
|
+ admin.setChannelCompleteCount(user.getChannelCompleteCount());
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return admins;
|
|
|
}
|
|
|
|
|
|
//迭代获取所有部门与部门员工并计算出部门数量
|