yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-07-24 02:09:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

线上课学员列表返回学员的部门信息

Browse Source
This commit is contained in:
none 2023-05-10 10:31:16 +08:00
parent bf956b4742
commit 19be6d96f9
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java
View File

@ -30,10 +30,7 @@ import xyz.playedu.api.domain.UserCourseRecord;
import xyz.playedu.api.event.UserCourseRecordDestroyEvent; import xyz.playedu.api.event.UserCourseRecordDestroyEvent;
import xyz.playedu.api.middleware.BackendPermissionMiddleware; import xyz.playedu.api.middleware.BackendPermissionMiddleware;
import xyz.playedu.api.request.backend.CourseUserDestroyRequest; import xyz.playedu.api.request.backend.CourseUserDestroyRequest;
import xyz.playedu.api.service.CourseService; import xyz.playedu.api.service.*;
import xyz.playedu.api.service.UserCourseHourRecordService;
import xyz.playedu.api.service.UserCourseRecordService;
import xyz.playedu.api.service.UserService;
import xyz.playedu.api.types.JsonResponse; import xyz.playedu.api.types.JsonResponse;
import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper; import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper;
import xyz.playedu.api.types.paginate.PaginationResult; import xyz.playedu.api.types.paginate.PaginationResult;
@ -62,6 +59,8 @@ public class CourseUserController {
@Autowired private UserService userService; @Autowired private UserService userService;
@Autowired private DepartmentService departmentService;
@Autowired private ApplicationContext ctx; @Autowired private ApplicationContext ctx;
@BackendPermissionMiddleware(slug = BPermissionConstant.COURSE_USER) @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE_USER)
@ -77,6 +76,7 @@ public class CourseUserController {
String name = MapUtils.getString(params, "name"); String name = MapUtils.getString(params, "name");
String email = MapUtils.getString(params, "email"); String email = MapUtils.getString(params, "email");
String idCard = MapUtils.getString(params, "id_card"); String idCard = MapUtils.getString(params, "id_card");
Integer depId = MapUtils.getInteger(params, "dep_id");
UserPaginateFilter filter = new UserPaginateFilter(); UserPaginateFilter filter = new UserPaginateFilter();
filter.setName(name); filter.setName(name);
@ -86,9 +86,18 @@ public class CourseUserController {
filter.setIdCard(idCard); filter.setIdCard(idCard);
// 所属部门 // 所属部门
List<Integer> depIds = courseService.getDepIdsByCourseId(courseId); if (depId != null && depId > 0) { // 设置过滤部门
if (depIds != null && depIds.size() > 0) { filter.setDepIds(
filter.setDepIds(depIds); new ArrayList<>() {
{
add(depId);
}
});
} else { // 默认读取课程关联的全部部门
List<Integer> depIds = courseService.getDepIdsByCourseId(courseId);
if (depIds != null && depIds.size() > 0) {
filter.setDepIds(depIds);
}
} }
PaginationResult<User> result = userService.paginate(page, size, filter); PaginationResult<User> result = userService.paginate(page, size, filter);
@ -121,6 +130,10 @@ public class CourseUserController {
UserCourseHourRecordUserFirstCreatedAtMapper UserCourseHourRecordUserFirstCreatedAtMapper
::getCreatedAt))); ::getCreatedAt)));
data.put("course", courseService.findOrFail(courseId)); data.put("course", courseService.findOrFail(courseId));
data.put(
"user_dep_ids",
userService.getDepIdsGroup(result.getData().stream().map(User::getId).toList()));
data.put("departments", departmentService.id2name());
return JsonResponse.data(data); return JsonResponse.data(data);
} }