From 39c5916fdb225f446e34d22b33574daa3efdbaf1 Mon Sep 17 00:00:00 2001
From: wangzhibiao <wangzhibiao@gitlab.com>
Date: Sun, 20 Sep 2026 22:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=BB=E5=83=8F=EF=BC=9A?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E5=AE=BF=E8=88=8D=E7=9C=9F=E5=AE=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B9=B6=E6=81=A2=E5=A4=8D360=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../train/domain/analysis/Student360Vo.java   | 12 +++++++++++
 .../impl/TrainAnalysisServiceImpl.java        | 20 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/analysis/Student360Vo.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/analysis/Student360Vo.java
index d66aec34e..4bb92e1a9 100644
--- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/analysis/Student360Vo.java
+++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/analysis/Student360Vo.java
@@ -53,6 +53,9 @@ public class Student360Vo implements Serializable
     /* ========== 6. 住宿与门禁客观状态 ========== */
     private Boolean hasAccommodation = false;
     private String dormId;
+    private String dormBuilding;
+    private String dormFloor;
+    private String dormRoom;
     private String roomName;
     private String bedNo;
     private Integer accommodationStatus;
@@ -141,6 +144,15 @@ public class Student360Vo implements Serializable
     public String getDormId() { return dormId; }
     public void setDormId(String dormId) { this.dormId = dormId; }
 
+    public String getDormBuilding() { return dormBuilding; }
+    public void setDormBuilding(String dormBuilding) { this.dormBuilding = dormBuilding; }
+
+    public String getDormFloor() { return dormFloor; }
+    public void setDormFloor(String dormFloor) { this.dormFloor = dormFloor; }
+
+    public String getDormRoom() { return dormRoom; }
+    public void setDormRoom(String dormRoom) { this.dormRoom = dormRoom; }
+
     public String getRoomName() { return roomName; }
     public void setRoomName(String roomName) { this.roomName = roomName; }
 
diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainAnalysisServiceImpl.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainAnalysisServiceImpl.java
index 5e71c10d4..2c9690425 100644
--- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainAnalysisServiceImpl.java
+++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainAnalysisServiceImpl.java
@@ -443,7 +443,25 @@ public class TrainAnalysisServiceImpl implements ITrainAnalysisService
         {
             vo.setHasAccommodation(true);
             vo.setDormId(dorm.get("dorm_id") != null ? String.valueOf(dorm.get("dorm_id")) : "-");
-            vo.setRoomName(dorm.get("room_name") != null ? String.valueOf(dorm.get("room_name")) : "宿舍");
+            String bld = dorm.get("dorm_building") != null ? String.valueOf(dorm.get("dorm_building")) : "";
+            String floor = dorm.get("dorm_floor") != null ? String.valueOf(dorm.get("dorm_floor")) : "";
+            String room = dorm.get("dorm_room") != null ? String.valueOf(dorm.get("dorm_room")) : "";
+            vo.setDormBuilding(bld);
+            vo.setDormFloor(floor);
+            vo.setDormRoom(room);
+
+            StringBuilder sb = new StringBuilder();
+            if (!bld.isEmpty()) sb.append(bld);
+            if (!floor.isEmpty()) {
+                if (sb.length() > 0) sb.append(" / ");
+                sb.append(floor);
+            }
+            if (!room.isEmpty()) {
+                if (sb.length() > 0) sb.append(" / ");
+                sb.append(room).append("室");
+            }
+            vo.setRoomName(sb.length() > 0 ? sb.toString() : "宿舍房间");
+
             vo.setBedNo(dorm.get("bed_no") != null ? String.valueOf(dorm.get("bed_no")) : "-");
             Integer accStatus = dorm.get("accommodation_status") != null ? ((Number) dorm.get("accommodation_status")).intValue() : 0;
             vo.setAccommodationStatus(accStatus);