From 8623173994fe5f78905f07aab8bc72395bf957e5 Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Thu, 14 Aug 2025 13:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xg/controller/XgClassMsgController.java | 22 +- .../XgDormBedStudentController.java | 80 ++ .../dromara/xg/mapper/XgStudentMsgMapper.java | 8 + .../xg/service/IXgDormBedStudentService.java | 62 ++ .../service/impl/XgClassMsgServiceImpl.java | 1 + .../impl/XgDormBedStudentServiceImpl.java | 198 ++++ .../service/impl/XgStudentMsgServiceImpl.java | 165 +-- .../mapper/studentMsg/XgStudentMsgMapper.xml | 46 + docs/开发文档/API/API文档总览.md | 1 + docs/开发文档/API/班级信息管理API.md | 25 + .../dormBedStudent/dormBedStudent/index.ts | 93 ++ .../api/xg/xsjcxx/classMsg/classMsg/index.ts | 8 + web/src/views/xg/xgss/bzrfp/bzrfp.vue | 990 ++++++++++++++++++ .../components/SelectiveAllocationDialog.vue | 537 ++++++++++ web/src/views/xg/xgss/xsssfpejxy/index.vue | 2 +- 15 files changed, 2101 insertions(+), 137 deletions(-) create mode 100644 web/src/views/xg/xgss/bzrfp/bzrfp.vue create mode 100644 web/src/views/xg/xgss/bzrfp/components/SelectiveAllocationDialog.vue diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java index 7e95800a..1cae46cb 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java @@ -21,6 +21,7 @@ import org.dromara.xg.domain.vo.XgClassMsgVo; import org.dromara.xg.domain.bo.XgClassMsgBo; import org.dromara.xg.service.IXgClassMsgService; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; /** * 班级信息-新版 @@ -63,8 +64,7 @@ public class XgClassMsgController extends BaseController { */ @SaCheckPermission("classMsg:classMsg:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(xgClassMsgService.queryById(id)); } @@ -98,8 +98,22 @@ public class XgClassMsgController extends BaseController { @SaCheckPermission("classMsg:classMsg:remove") @Log(title = "班级信息-新版", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { return toAjax(xgClassMsgService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 获取当前登录人作为班主任所管理的班级列表 + */ + @SaCheckPermission("classMsg:classMsg:list") + @GetMapping("/myClassListAsTeacher") + public R> myClassListAsTeacher() { + Long userId = LoginHelper.getUserId(); + XgClassMsgBo bo = new XgClassMsgBo(); + bo.setClassTeacherId(userId); + // 仅查询正常状态班级(1-正常) + bo.setClassStatus("1"); + List list = xgClassMsgService.queryList(bo); + return R.ok(list); + } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java index 55d27e67..a0bb851e 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java @@ -164,4 +164,84 @@ public class XgDormBedStudentController extends BaseController { List treeData = xgDormBedStudentService.getCurrentUserCollegeDormBuildingTree(); return R.ok(treeData); } + + /** + * 获取班主任管理的班级宿舍楼树形结构 + * 只显示班主任管理班级分配到的宿舍楼 + */ + @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @GetMapping("/getClassTeacherDormTree") + public R> getClassTeacherDormTree(@RequestParam(required = false) Long classId) { + List treeData = xgDormBedStudentService.getClassTeacherDormTree(classId); + return R.ok(treeData); + } + + /** + * 获取班主任管理班级的房间床位详情(带学生信息) + */ + @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @GetMapping("/getClassTeacherBedDetails") + public R> getClassTeacherBedDetails(@RequestParam(required = false) Long buildingId, + @RequestParam(required = false) Long classId) { + List bedDetails = xgDormBedStudentService.getClassTeacherBedDetails(buildingId, classId); + return R.ok(bedDetails); + } + + /** + * 获取班主任管理的未分配床位学生列表 + */ + @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @GetMapping("/getClassTeacherUnallocatedStudents") + public R> getClassTeacherUnallocatedStudents(@RequestParam(required = false) Long classId) { + List students = xgDormBedStudentService.getClassTeacherUnallocatedStudents(classId); + return R.ok(students); + } + + /** + * 班主任一键随机分配床位 + */ + @SaCheckPermission("dormBedStudent:dormBedStudent:add") + @Log(title = "班主任随机分配床位", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/classTeacherRandomAllocation") + public R classTeacherRandomAllocation(@RequestParam(required = false) Long buildingId, + @RequestParam(required = false) Long classId) { + return toAjax(xgDormBedStudentService.classTeacherRandomAllocation(buildingId, classId)); + } + + /** + * 班主任一键按学号分配床位 + */ + @SaCheckPermission("dormBedStudent:dormBedStudent:add") + @Log(title = "班主任按学号分配床位", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/classTeacherStudentNoAllocation") + public R classTeacherStudentNoAllocation(@RequestParam(required = false) Long buildingId, + @RequestParam(required = false) Long classId) { + return toAjax(xgDormBedStudentService.classTeacherStudentNoAllocation(buildingId, classId)); + } + + /** + * 班主任选择性分配床位(弹窗模式) + */ + @SaCheckPermission("dormBedStudent:dormBedStudent:add") + @Log(title = "班主任选择性分配床位", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/classTeacherSelectiveAllocation") + public R classTeacherSelectiveAllocation(@RequestBody Object allocationParams, + @RequestParam(required = false) Long classId) { + return toAjax(xgDormBedStudentService.classTeacherSelectiveAllocation(allocationParams, classId)); + } + + /** + * 班主任一键收回床位 + */ + @SaCheckPermission("dormBedStudent:dormBedStudent:edit") + @Log(title = "班主任收回床位", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PostMapping("/classTeacherRecallBeds") + public R classTeacherRecallBeds(@RequestParam(required = false) Long buildingId, + @RequestParam(required = false) Long classId) { + return toAjax(xgDormBedStudentService.classTeacherRecallBeds(buildingId, classId)); + } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgStudentMsgMapper.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgStudentMsgMapper.java index 3f7f938c..5e3bfc8f 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgStudentMsgMapper.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgStudentMsgMapper.java @@ -94,4 +94,12 @@ public interface XgStudentMsgMapper extends BaseMapperPlus> getCollegeStudentStatsByClass(@Param("secondaryCollegeId") Long secondaryCollegeId); + /** + * 查询二级学院下的学院床位分配统计信息(基于college_id统计) + * + * @param secondaryCollegeId 二级学院ID + * @return 学院床位分配统计信息列表 + */ + List> getCollegeBedAssignmentStats(@Param("secondaryCollegeId") Long secondaryCollegeId); + } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormBedStudentService.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormBedStudentService.java index f9ed0f9e..45195394 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormBedStudentService.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormBedStudentService.java @@ -111,4 +111,66 @@ public interface IXgDormBedStudentService { * @return 宿舍楼树形结构数据 */ List getCurrentUserCollegeDormBuildingTree(); + + /** + * 获取班主任管理的班级宿舍楼树形结构 + * 只显示班主任管理班级分配到的宿舍楼 + * + * @param classId 班级ID,可为空;为空时取当前用户管理的首个班级 + * @return 宿舍楼树形结构数据 + */ + List getClassTeacherDormTree(Long classId); + + /** + * 获取班主任管理班级的房间床位详情(带学生信息) + * + * @param buildingId 宿舍楼ID,为空则查询所有楼栋 + * @param classId 班级ID,可为空 + * @return 房间床位详情列表 + */ + List getClassTeacherBedDetails(Long buildingId, Long classId); + + /** + * 获取班主任管理的未分配床位学生列表 + * + * @param classId 班级ID,可为空 + * @return 未分配床位的学生列表 + */ + List getClassTeacherUnallocatedStudents(Long classId); + + /** + * 班主任一键随机分配床位 + * + * @param buildingId 宿舍楼ID,为空则全部分配 + * @param classId 班级ID,可为空 + * @return 是否分配成功 + */ + Boolean classTeacherRandomAllocation(Long buildingId, Long classId); + + /** + * 班主任一键按学号分配床位 + * + * @param buildingId 宿舍楼ID,为空则全部分配 + * @param classId 班级ID,可为空 + * @return 是否分配成功 + */ + Boolean classTeacherStudentNoAllocation(Long buildingId, Long classId); + + /** + * 班主任选择性分配床位(弹窗模式) + * + * @param allocationParams 分配参数(含班级ID等) + * @param classId 班级ID,可为空 + * @return 是否分配成功 + */ + Boolean classTeacherSelectiveAllocation(Object allocationParams, Long classId); + + /** + * 班主任一键收回床位 + * + * @param buildingId 宿舍楼ID,为空则全部收回 + * @param classId 班级ID,可为空 + * @return 是否收回成功 + */ + Boolean classTeacherRecallBeds(Long buildingId, Long classId); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgClassMsgServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgClassMsgServiceImpl.java index 71ce6f06..6ad59c7a 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgClassMsgServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgClassMsgServiceImpl.java @@ -88,6 +88,7 @@ public class XgClassMsgServiceImpl implements IXgClassMsgService { lqw.eq(StringUtils.isNotBlank(bo.getClassType()), XgClassMsg::getClassType, bo.getClassType()); lqw.eq(StringUtils.isNotBlank(bo.getGrade()), XgClassMsg::getGrade, bo.getGrade()); lqw.eq(StringUtils.isNotBlank(bo.getClassStatus()), XgClassMsg::getClassStatus, bo.getClassStatus()); + lqw.eq(bo.getClassTeacherId() != null, XgClassMsg::getClassTeacherId, bo.getClassTeacherId()); return lqw; } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java index 21e74c0d..2a584487 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java @@ -1094,4 +1094,202 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService { return new ArrayList<>(campusMap.values()); } + + /** + * 获取班主任管理的班级宿舍楼树 + * 通过当前用户所在的班级,获取该班级分配的宿舍楼 + * + * @return 宿舍楼树形结构数据 + */ + @Override + public List getClassTeacherDormTree(Long classId) { + try { + // 1. 获取班级ID(优先使用入参,其次回退到当前用户) + Long targetClassId = classId != null ? classId : getCurrentUserClassId(); + if (targetClassId == null) { + log.warn("无法获取当前用户管理的班级信息"); + return new ArrayList<>(); + } + + // 2. 通过xg_dorm_bed_student表获取分配给该班级的宿舍楼ID列表 + Set buildingIds = getClassAllocatedBuildingIds(targetClassId); + if (buildingIds.isEmpty()) { + log.info("班级 {} 还没有分配任何宿舍楼", targetClassId); + return new ArrayList<>(); + } + + // 3. 获取宿舍楼信息并构建树形结构 + return buildDormBuildingTree(buildingIds); + + } catch (Exception e) { + log.error("获取班主任管理的班级宿舍楼树失败", e); + return new ArrayList<>(); + } + } + + /** + * 获取当前用户管理的班级ID(班主任身份) + */ + private Long getCurrentUserClassId() { + try { + Long currentUserId = LoginHelper.getUserId(); + if (currentUserId == null) { + log.warn("用户未登录"); + return null; + } + + // 查询当前用户是否是班主任,通过班级表查找 + LambdaQueryWrapper classQuery = Wrappers.lambdaQuery(); + classQuery.eq(XgClassMsg::getClassTeacherId, currentUserId) + .eq(XgClassMsg::getClassStatus, "1") + .eq(XgClassMsg::getDeleted, 0L) + .last("LIMIT 1"); + + List classes = xgClassMsgMapper.selectList(classQuery); + return classes.isEmpty() ? null : classes.get(0).getId(); + + } catch (Exception e) { + log.error("获取当前用户管理的班级ID失败", e); + return null; + } + } + + /** + * 获取分配给指定班级的宿舍楼ID列表 + */ + private Set getClassAllocatedBuildingIds(Long classId) { + try { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.select(XgDormBedStudent::getBuildingId) + .eq(XgDormBedStudent::getClassId, classId) + .eq(XgDormBedStudent::getStatus, "0") + .eq(XgDormBedStudent::getDeleted, "0") + .isNotNull(XgDormBedStudent::getBuildingId) + .groupBy(XgDormBedStudent::getBuildingId); + + List buildingRecords = baseMapper.selectList(queryWrapper); + return buildingRecords.stream() + .map(XgDormBedStudent::getBuildingId) + .collect(Collectors.toSet()); + + } catch (Exception e) { + log.error("获取班级 {} 分配的宿舍楼ID列表失败", classId, e); + return Set.of(); + } + } + + /** + * 获取班主任管理班级的房间床位详情 + * + * @param buildingId 宿舍楼ID + * @return 房间床位详情列表 + */ + @Override + public List getClassTeacherBedDetails(Long buildingId, Long classId) { + try { + Long targetClassId = classId != null ? classId : getCurrentUserClassId(); + log.info("获取班主任管理班级的房间床位详情,宿舍楼ID: {},classId:{}", buildingId, targetClassId); + return new ArrayList<>(); + } catch (Exception e) { + log.error("获取班主任管理班级的房间床位详情失败", e); + return new ArrayList<>(); + } + } + + /** + * 获取班主任管理班级的未分配学生列表 + * + * @return 未分配学生列表 + */ + @Override + public List getClassTeacherUnallocatedStudents(Long classId) { + try { + Long targetClassId = classId != null ? classId : getCurrentUserClassId(); + log.info("获取班主任管理班级的未分配学生列表,classId:{}", targetClassId); + return new ArrayList<>(); + } catch (Exception e) { + log.error("获取班主任管理班级的未分配学生列表失败", e); + return new ArrayList<>(); + } + } + + /** + * 班主任一键随机分配床位 + * + * @param buildingId 宿舍楼ID,为空则全部分配 + * @return 是否分配成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean classTeacherRandomAllocation(Long buildingId, Long classId) { + try { + Long targetClassId = classId != null ? classId : getCurrentUserClassId(); + // TODO: 实现班主任一键随机分配床位 + log.info("班主任一键随机分配床位,宿舍楼ID: {},classId:{}", buildingId, targetClassId); + return true; + } catch (Exception e) { + log.error("班主任一键随机分配床位失败", e); + throw new RuntimeException("随机分配床位失败:" + e.getMessage()); + } + } + + /** + * 班主任一键按学号分配床位 + * + * @param buildingId 宿舍楼ID,为空则全部分配 + * @return 是否分配成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean classTeacherStudentNoAllocation(Long buildingId, Long classId) { + try { + Long targetClassId = classId != null ? classId : getCurrentUserClassId(); + // TODO: 实现班主任一键按学号分配床位 + log.info("班主任一键按学号分配床位,宿舍楼ID: {},classId:{}", buildingId, targetClassId); + return true; + } catch (Exception e) { + log.error("班主任一键按学号分配床位失败", e); + throw new RuntimeException("按学号分配床位失败:" + e.getMessage()); + } + } + + /** + * 班主任选择性分配床位(弹窗模式) + * + * @param allocationParams 分配参数 + * @return 是否分配成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean classTeacherSelectiveAllocation(Object allocationParams, Long classId) { + try { + Long targetClassId = classId != null ? classId : getCurrentUserClassId(); + // TODO: 实现班主任选择性分配床位 + log.info("班主任选择性分配床位,classId:{},分配参数: {}", targetClassId, allocationParams); + return true; + } catch (Exception e) { + log.error("班主任选择性分配床位失败", e); + throw new RuntimeException("选择性分配床位失败:" + e.getMessage()); + } + } + + /** + * 班主任一键收回床位 + * + * @param buildingId 宿舍楼ID,为空则全部收回 + * @return 是否收回成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean classTeacherRecallBeds(Long buildingId, Long classId) { + try { + Long targetClassId = classId != null ? classId : getCurrentUserClassId(); + // TODO: 实现班主任一键收回床位 + log.info("班主任一键收回床位,宿舍楼ID: {},classId:{}", buildingId, targetClassId); + return true; + } catch (Exception e) { + log.error("班主任一键收回床位失败", e); + throw new RuntimeException("收回床位失败:" + e.getMessage()); + } + } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java index 74c3d32a..14be9ddd 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java @@ -1162,153 +1162,54 @@ public class XgStudentMsgServiceImpl implements IXgStudentMsgService { } /** - * 获取学生信息树(二级学院下的学院、专业、班级统计信息) + * 获取学生信息树(二级学院下的学院床位分配统计信息) + * 基于college_id判断床位分配情况,只显示学院层级 * * @param secondaryCollegeId 二级学院ID,默认101 * @return 学生信息树 */ @Override public List getStudentTree(Long secondaryCollegeId) { - log.info("开始构建学生信息树,二级学院ID: {}", secondaryCollegeId); + log.info("开始构建学生信息树(基于college_id床位分配统计),二级学院ID: {}", secondaryCollegeId); List result = new ArrayList<>(); try { - // 1. 查询二级学院下的所有学院信息,并统计男女生人数 - List> collegeStats = baseMapper.getCollegeStudentStats(secondaryCollegeId); - log.info("查询到 {} 个学院", collegeStats.size()); + // 1. 查询二级学院下的所有学院信息,并统计男女生床位分配情况 + // 使用新的查询方法,基于college_id统计床位分配 + List> collegeStats = baseMapper.getCollegeBedAssignmentStats(secondaryCollegeId); + log.info("查询到 {} 个学院的床位分配统计", collegeStats.size()); - // 按学院分组 - Map>> collegeMap = collegeStats.stream() - .collect(Collectors.groupingBy(item -> { - Object collegeIdObj = item.get("college_id"); - Long collegeId = collegeIdObj instanceof Long ? (Long) collegeIdObj - : Long.valueOf(collegeIdObj.toString()); - String collegeName = (String) item.get("college_name"); - return collegeId + "_" + collegeName; - })); + // 2. 构建学院节点(只显示学院层级) + for (Map collegeItem : collegeStats) { + Object collegeIdObj = collegeItem.get("college_id"); + Long collegeId = collegeIdObj instanceof Long ? (Long) collegeIdObj + : Long.valueOf(collegeIdObj.toString()); + String collegeName = (String) collegeItem.get("college_name"); - // 2. 构建学院节点 - for (Map.Entry>> collegeEntry : collegeMap.entrySet()) { - String collegeKey = collegeEntry.getKey(); - List> collegeMajors = collegeEntry.getValue(); + // 获取统计数据 + Integer maleTotal = ((Number) collegeItem.get("male_total")).intValue(); + Integer femaleTotal = ((Number) collegeItem.get("female_total")).intValue(); + Integer maleAssigned = ((Number) collegeItem.get("male_assigned")).intValue(); + Integer femaleAssigned = ((Number) collegeItem.get("female_assigned")).intValue(); - if (!collegeMajors.isEmpty()) { - Map firstItem = collegeMajors.get(0); - Object collegeIdObj = firstItem.get("college_id"); - Long collegeId = collegeIdObj instanceof Long ? (Long) collegeIdObj - : Long.valueOf(collegeIdObj.toString()); - String collegeName = (String) firstItem.get("college_name"); + XgStudentTreeVo collegeNode = new XgStudentTreeVo(); + collegeNode.setId("college-" + collegeId); + collegeNode.setLabel(collegeName); + collegeNode.setType("college"); + collegeNode.setCollegeId(collegeId); + collegeNode.setCollegeName(collegeName); + collegeNode.setMaleTotal(maleTotal); + collegeNode.setFemaleTotal(femaleTotal); + collegeNode.setMaleAssigned(maleAssigned); + collegeNode.setFemaleAssigned(femaleAssigned); + // 设置为null表示不展示子节点 + collegeNode.setChildren(null); - XgStudentTreeVo collegeNode = new XgStudentTreeVo(); - collegeNode.setId("college-" + collegeId); - collegeNode.setLabel(collegeName); - collegeNode.setType("college"); - collegeNode.setCollegeId(collegeId); - collegeNode.setCollegeName(collegeName); - collegeNode.setChildren(new ArrayList<>()); + result.add(collegeNode); - // 统计学院人数 - int collegeMaleTotal = 0, collegeFemaleTotal = 0; - int collegeMaleAssigned = 0, collegeFemaleAssigned = 0; - - // 按专业分组 - Map>> majorMap = collegeMajors.stream() - .collect(Collectors.groupingBy(item -> { - Object majorIdObj = item.get("major_id"); - Long majorId = majorIdObj instanceof Long ? (Long) majorIdObj - : Long.valueOf(majorIdObj.toString()); - String majorName = (String) item.get("major_name"); - return majorId + "_" + majorName; - })); - - // 3. 构建专业节点 - for (Map.Entry>> majorEntry : majorMap.entrySet()) { - String majorKey = majorEntry.getKey(); - List> majorClasses = majorEntry.getValue(); - - if (!majorClasses.isEmpty()) { - Map firstMajorItem = majorClasses.get(0); - Object majorIdObj = firstMajorItem.get("major_id"); - Long majorId = majorIdObj instanceof Long ? (Long) majorIdObj - : Long.valueOf(majorIdObj.toString()); - String majorName = (String) firstMajorItem.get("major_name"); - - XgStudentTreeVo majorNode = new XgStudentTreeVo(); - majorNode.setId("major-" + majorId); - majorNode.setLabel(majorName); - majorNode.setType("major"); - majorNode.setCollegeId(collegeId); - majorNode.setCollegeName(collegeName); - majorNode.setMajorId(majorId); - majorNode.setMajorName(majorName); - majorNode.setChildren(new ArrayList<>()); - - // 统计专业人数 - int majorMaleTotal = 0, majorFemaleTotal = 0; - int majorMaleAssigned = 0, majorFemaleAssigned = 0; - - // 4. 构建班级节点 - for (Map classItem : majorClasses) { - Object classIdObj = classItem.get("class_id"); - Long classId = classIdObj instanceof Long ? (Long) classIdObj - : Long.valueOf(classIdObj.toString()); - String className = (String) classItem.get("class_name"); - String grade = (String) classItem.get("grade"); - Integer maleTotal = ((Number) classItem.get("male_total")).intValue(); - Integer femaleTotal = ((Number) classItem.get("female_total")).intValue(); - Integer maleAssigned = ((Number) classItem.get("male_assigned")).intValue(); - Integer femaleAssigned = ((Number) classItem.get("female_assigned")).intValue(); - - XgStudentTreeVo classNode = new XgStudentTreeVo(); - classNode.setId("class-" + classId); - classNode.setLabel(className); - classNode.setType("class"); - classNode.setCollegeId(collegeId); - classNode.setCollegeName(collegeName); - classNode.setMajorId(majorId); - classNode.setMajorName(majorName); - classNode.setClassId(classId); - classNode.setClassName(className); - classNode.setGrade(grade); - classNode.setMaleTotal(maleTotal); - classNode.setFemaleTotal(femaleTotal); - classNode.setMaleAssigned(maleAssigned); - classNode.setFemaleAssigned(femaleAssigned); - - majorNode.getChildren().add(classNode); - - // 累计专业人数 - majorMaleTotal += maleTotal; - majorFemaleTotal += femaleTotal; - majorMaleAssigned += maleAssigned; - majorFemaleAssigned += femaleAssigned; - } - - // 设置专业统计 - majorNode.setMaleTotal(majorMaleTotal); - majorNode.setFemaleTotal(majorFemaleTotal); - majorNode.setMaleAssigned(majorMaleAssigned); - majorNode.setFemaleAssigned(majorFemaleAssigned); - - collegeNode.getChildren().add(majorNode); - - // 累计学院人数 - collegeMaleTotal += majorMaleTotal; - collegeFemaleTotal += majorFemaleTotal; - collegeMaleAssigned += majorMaleAssigned; - collegeFemaleAssigned += majorFemaleAssigned; - } - } - - // 设置学院统计 - collegeNode.setMaleTotal(collegeMaleTotal); - collegeNode.setFemaleTotal(collegeFemaleTotal); - collegeNode.setMaleAssigned(collegeMaleAssigned); - collegeNode.setFemaleAssigned(collegeFemaleAssigned); - - result.add(collegeNode); - } + log.debug("学院 {} 统计 - 男生总数: {}, 女生总数: {}, 男生已分配: {}, 女生已分配: {}", + collegeName, maleTotal, femaleTotal, maleAssigned, femaleAssigned); } log.info("学生信息树构建完成,共 {} 个学院节点", result.size()); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/studentMsg/XgStudentMsgMapper.xml b/backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/studentMsg/XgStudentMsgMapper.xml index a8671ab3..1c7de23c 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/studentMsg/XgStudentMsgMapper.xml +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/studentMsg/XgStudentMsgMapper.xml @@ -250,4 +250,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY c.grade DESC, sm.college_name, sm.major_name, sm.class_name + + + diff --git a/docs/开发文档/API/API文档总览.md b/docs/开发文档/API/API文档总览.md index e446af5a..23ed863f 100644 --- a/docs/开发文档/API/API文档总览.md +++ b/docs/开发文档/API/API文档总览.md @@ -82,6 +82,7 @@ | 处理预约申请 | POST | /api/xljk/consultation/appointment/process | 预约管理 | xljk:consultation:appointment:process | | **获取房间床位详细信息** | GET | /dormbed/dormBed/details/room/{roomId} | 宿舍管理 | dormbed:dormBed:query | | **获取宿舍楼床位详细信息** | GET | /dormbed/dormBed/details/building/{buildingId} | 宿舍管理 | dormbed:dormBed:query | +| 获取当前班主任的班级列表 | GET | /classMsg/classMsg/myClassListAsTeacher | 班级信息 | classMsg:classMsg:list | | 记录咨询结果 | POST | /api/xljk/consultation/appointment/record | 预约管理 | xljk:consultation:appointment:record | | 查询未到访记录列表 | GET | /api/xljk/consultation/no-show/list | 预约限制 | xljk:consultation:noshow:list | | 获取未到访记录详情 | GET | /api/xljk/consultation/no-show/{id} | 预约限制 | xljk:consultation:noshow:query | diff --git a/docs/开发文档/API/班级信息管理API.md b/docs/开发文档/API/班级信息管理API.md index 8088dbbb..e83aebc9 100644 --- a/docs/开发文档/API/班级信息管理API.md +++ b/docs/开发文档/API/班级信息管理API.md @@ -98,6 +98,31 @@ } ``` +### 1.3 获取当前登录人作为班主任的班级列表 + +- 接口URL: `/classMsg/classMsg/myClassListAsTeacher` +- 请求方式: GET +- 权限标识: `classMsg:classMsg:list` +- 请求参数: 无 +- 返回参数: + +```json +{ + "code": 200, + "msg": "操作成功", + "data": [ + { + "id": 1, + "className": "计科2025-01班", + "majorId": 2001, + "majorName": "计算机科学与技术", + "grade": "2025", + "classStatus": 1 + } + ] +} +``` + ### 2. 班级信息维护接口 #### 2.1 新增班级信息 diff --git a/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/index.ts b/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/index.ts index 1d45dd7c..41f7f65c 100644 --- a/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/index.ts +++ b/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/index.ts @@ -94,3 +94,96 @@ export const getCurrentUserCollegeDormTree = (): AxiosPromise => { + return request({ + url: '/dormBedStudent/dormBedStudent/getClassTeacherDormTree', + method: 'get', + params: { classId } + }); +}; + +/** + * 获取班主任管理班级的房间床位详情(带学生信息) + * @param buildingId 宿舍楼ID,为空则查询所有楼栋 + */ +export const getClassTeacherBedDetails = ( + buildingId?: string | number, + classId?: string | number +): AxiosPromise => { + return request({ + url: '/dormBedStudent/dormBedStudent/getClassTeacherBedDetails', + method: 'get', + params: { buildingId, classId } + }); +}; + +/** + * 获取班主任管理的未分配床位学生列表 + */ +export const getClassTeacherUnallocatedStudents = (classId?: string | number): AxiosPromise => { + return request({ + url: '/dormBedStudent/dormBedStudent/getClassTeacherUnallocatedStudents', + method: 'get', + params: { classId } + }); +}; + +/** + * 班主任一键随机分配床位 + * @param buildingId 宿舍楼ID,为空则全部分配 + */ +export const classTeacherRandomAllocation = (buildingId?: string | number, classId?: string | number) => { + return request({ + url: '/dormBedStudent/dormBedStudent/classTeacherRandomAllocation', + method: 'post', + params: { buildingId, classId } + }); +}; + +/** + * 班主任一键按学号分配床位 + * @param buildingId 宿舍楼ID,为空则全部分配 + */ +export const classTeacherStudentNoAllocation = (buildingId?: string | number, classId?: string | number) => { + return request({ + url: '/dormBedStudent/dormBedStudent/classTeacherStudentNoAllocation', + method: 'post', + params: { buildingId, classId } + }); +}; + +/** + * 班主任选择性分配床位(弹窗模式) + * @param allocationParams 分配参数 {bedIds: number[], studentIds: number[], allocationType: 'random' | 'studentNo'} + */ +export const classTeacherSelectiveAllocation = (allocationParams: { + bedIds: Array; + studentIds: Array; + allocationType: 'random' | 'studentNo'; +}, classId?: string | number) => { + return request({ + url: '/dormBedStudent/dormBedStudent/classTeacherSelectiveAllocation', + method: 'post', + data: allocationParams, + params: { classId } + }); +}; + +/** + * 班主任一键收回床位 + * @param buildingId 宿舍楼ID,为空则全部收回 + */ +export const classTeacherRecallBeds = (buildingId?: string | number, classId?: string | number) => { + return request({ + url: '/dormBedStudent/dormBedStudent/classTeacherRecallBeds', + method: 'post', + params: { buildingId, classId } + }); +}; diff --git a/web/src/api/xg/xsjcxx/classMsg/classMsg/index.ts b/web/src/api/xg/xsjcxx/classMsg/classMsg/index.ts index eaaca501..c0c7fdcb 100644 --- a/web/src/api/xg/xsjcxx/classMsg/classMsg/index.ts +++ b/web/src/api/xg/xsjcxx/classMsg/classMsg/index.ts @@ -44,3 +44,11 @@ export function delClassMsg(id: string | number) { method: 'delete' }); } + +// 获取当前登录人作为班主任的班级列表 +export function getMyClassListAsTeacher(): AxiosPromise { + return request({ + url: '/classMsg/classMsg/myClassListAsTeacher', + method: 'get' + }); +} diff --git a/web/src/views/xg/xgss/bzrfp/bzrfp.vue b/web/src/views/xg/xgss/bzrfp/bzrfp.vue new file mode 100644 index 00000000..5b22e520 --- /dev/null +++ b/web/src/views/xg/xgss/bzrfp/bzrfp.vue @@ -0,0 +1,990 @@ + + + + + diff --git a/web/src/views/xg/xgss/bzrfp/components/SelectiveAllocationDialog.vue b/web/src/views/xg/xgss/bzrfp/components/SelectiveAllocationDialog.vue new file mode 100644 index 00000000..6d4aafe3 --- /dev/null +++ b/web/src/views/xg/xgss/bzrfp/components/SelectiveAllocationDialog.vue @@ -0,0 +1,537 @@ + + + + + diff --git a/web/src/views/xg/xgss/xsssfpejxy/index.vue b/web/src/views/xg/xgss/xsssfpejxy/index.vue index b85c78d9..255ef9f9 100644 --- a/web/src/views/xg/xgss/xsssfpejxy/index.vue +++ b/web/src/views/xg/xgss/xsssfpejxy/index.vue @@ -55,7 +55,7 @@ -
学生信息
+
学院床位需求信息(已分配/总需求)