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 8c5cedb7..7de403d4 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 @@ -323,7 +323,7 @@ public class XgDormBedStudentController extends BaseController { /** * 根据房间ID获取住在当前房间的所有学生信息 - * 包含学生姓名、学号、性别、学院名称、专业名称、班级名称 + * 包含学生姓名、学号、性别、学院名称、专业名称、班级名称、床位编码、床位ID */ @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getRoomStudents") diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgDormBedStudentMapper.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgDormBedStudentMapper.java index 77b6e6b8..7bd4d31d 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgDormBedStudentMapper.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgDormBedStudentMapper.java @@ -143,7 +143,7 @@ public interface XgDormBedStudentMapper extends BaseMapperPlus getRoomStudents(Long roomId) { @@ -2299,6 +2299,8 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService { // 床位信息 studentInfo.put("bedName", detailMap.get("bed_name")); + studentInfo.put("bedCode", detailMap.get("bed_code")); + studentInfo.put("bedId", detailMap.get("bed_id")); result.add(studentInfo); } diff --git a/mobile/src/pages/xgss/wsjc/wsjcAdd.vue b/mobile/src/pages/xgss/wsjc/wsjcAdd.vue index 7741dcfa..70882258 100644 --- a/mobile/src/pages/xgss/wsjc/wsjcAdd.vue +++ b/mobile/src/pages/xgss/wsjc/wsjcAdd.vue @@ -186,7 +186,7 @@ @@ -236,7 +236,7 @@ 个人得分