新增开班主流程：实现学校周课表展示、住宿状态直观外露及课次考勤闭环联动

RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/EnrollmentItemVO.java

@@ -55,6 +55,18 @@ public class EnrollmentItemVO
     /** 备注 */
     private String remark;
 
+    /** 宿舍楼栋 (当前分配) */
+    private String dormBuilding;
+
+    /** 宿舍房间号 (当前分配) */
+    private String dormRoom;
+
+    /** 床位号 (当前分配) */
+    private String bedNo;
+
+    /** 住宿状态 (0: 预分配, 1: 已入住, 2: 已退宿) */
+    private Integer accommodationStatus;
+
     public Long getEnrollmentId()
     {
         return enrollmentId;
@@ -204,4 +216,44 @@ public class EnrollmentItemVO
     {
         this.remark = remark;
     }
+
+    public String getDormBuilding()
+    {
+        return dormBuilding;
+    }
+
+    public void setDormBuilding(String dormBuilding)
+    {
+        this.dormBuilding = dormBuilding;
+    }
+
+    public String getDormRoom()
+    {
+        return dormRoom;
+    }
+
+    public void setDormRoom(String dormRoom)
+    {
+        this.dormRoom = dormRoom;
+    }
+
+    public String getBedNo()
+    {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo)
+    {
+        this.bedNo = bedNo;
+    }
+
+    public Integer getAccommodationStatus()
+    {
+        return accommodationStatus;
+    }
+
+    public void setAccommodationStatus(Integer accommodationStatus)
+    {
+        this.accommodationStatus = accommodationStatus;
+    }
 }

RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainEnrollmentMapper.xml

@@ -78,9 +78,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                e.accommodation_required as accommodationRequired,
                e.join_time as joinTime,
                e.complete_time as completeTime,
-               e.remark as remark
+               e.remark as remark,
+               d.dorm_building as dormBuilding,
+               d.dorm_room as dormRoom,
+               a.bed_no as bedNo,
+               a.accommodation_status as accommodationStatus
         from train_enrollment e
         left join train_student s on e.student_id = s.s_id
+        left join (
+            select a1.enrollment_id, a1.dorm_id, a1.bed_no, a1.accommodation_status
+            from train_accommodation a1
+            inner join (
+                select enrollment_id, max(accommodation_id) as max_id
+                from train_accommodation
+                group by enrollment_id
+            ) a2 on a1.accommodation_id = a2.max_id
+        ) a on e.enrollment_id = a.enrollment_id
+        left join train_dormitory_info d on a.dorm_id = d.dorm_id
         <where>
             e.plan_id = #{planId}
             <if test="studentName != null and studentName != ''">