yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-12-17 00:44:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

学员部门包含子部门所有学员数量

Browse Source
This commit is contained in:
wsw
2024-06-02 14:57:15 +08:00
parent 4d527cff77
commit 7c84e185a6
4 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
playedu-api/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java
View File

@@ -38,6 +38,7 @@ import xyz.playedu.common.domain.Department;
import xyz.playedu.common.domain.User;
import xyz.playedu.common.exception.NotFoundException;
import xyz.playedu.common.service.DepartmentService;
import xyz.playedu.common.service.UserDepartmentService;
import xyz.playedu.common.service.UserService;
import xyz.playedu.common.types.JsonResponse;
import xyz.playedu.common.types.paginate.PaginationResult;
@@ -71,12 +72,39 @@ public class DepartmentController {
@Autowired private LDAPBus ldapBus;
@Autowired private UserDepartmentService userDepartmentService;
@GetMapping("/index")
@Log(title = "部门-列表", businessType = BusinessTypeConstant.GET)
public JsonResponse index() {
HashMap<String, Object> data = new HashMap<>();
data.put("departments", departmentService.groupByParent());
data.put("dep_user_count", departmentService.getDepartmentsUserCount());
HashMap<Integer, Integer> depUserCount = new HashMap<>();
List<Department> allDepartmentList = departmentService.all();
if (StringUtil.isNotEmpty(allDepartmentList)) {
for (Department dep : allDepartmentList) {
List<Integer> depIds = new ArrayList<>();
depIds.add(dep.getId());
String parentChain = "";
if (StringUtil.isEmpty(dep.getParentChain())) {
parentChain = dep.getId() + "";
} else {
parentChain = dep.getParentChain() + "," + dep.getId();
}
// 获取所有子部门ID
List<Department> childDepartmentList =
departmentService.getChildDepartmentsByParentChain(
dep.getId(), parentChain);
if (StringUtil.isNotEmpty(childDepartmentList)) {
depIds.addAll(childDepartmentList.stream().map(Department::getId).toList());
}
List<Integer> departmentUserIds = userDepartmentService.getUserIdsByDepIds(depIds);
depUserCount.put(
dep.getId(), departmentUserIds.stream().distinct().toList().size());
}
}
data.put("dep_user_count", depUserCount);
data.put("user_total", userService.total());
return JsonResponse.data(data);
}

30
playedu-api/src/main/java/xyz/playedu/api/controller/backend/UserController.java
View File

@@ -107,11 +107,31 @@ public class UserController {
String createdAt = MapUtils.getString(params, "created_at");
String depIdsStr = MapUtils.getString(params, "dep_ids");
List<Integer> depIds = null;
if (depIdsStr != null && !depIdsStr.trim().isEmpty()) {
if ("0".equals(depIdsStr)) {
depIds = new ArrayList<>();
} else {
depIds = Arrays.stream(depIdsStr.split(",")).map(Integer::valueOf).toList();
if (StringUtil.isNotEmpty(depIdsStr)) {
depIds = new ArrayList<>();
if (!"0".equals(depIdsStr)) {
List<Department> departmentList =
departmentService.chunk(
Arrays.stream(depIdsStr.split(",")).map(Integer::valueOf).toList());
if (StringUtil.isNotEmpty(departmentList)) {
for (Department dep : departmentList) {
depIds.add(dep.getId());
String parentChain = "";
if (StringUtil.isEmpty(dep.getParentChain())) {
parentChain = dep.getId() + "";
} else {
parentChain = dep.getParentChain() + "," + dep.getId();
}
// 获取所有子部门ID
List<Department> childDepartmentList =
departmentService.getChildDepartmentsByParentChain(
dep.getId(), parentChain);
if (StringUtil.isNotEmpty(childDepartmentList)) {
depIds.addAll(
childDepartmentList.stream().map(Department::getId).toList());
}
}
}
}
}