From 0bf7d961ab6cba122146b3f5e98fb3173cdd1369 Mon Sep 17 00:00:00 2001
From: buliping <buliping@gitlab.com>
Date: Tue, 29 Sep 2026 14:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=AE=A4=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=B7=E5=A4=87=E5=A4=9A=E5=AA=92=E4=BD=93=E3=80=81?=
 =?UTF-8?q?=E6=8A=95=E5=BD=B1=E5=B1=9E=E6=80=A7=EF=BC=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?+=E4=BF=AE=E6=94=B9+=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6+?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TrainClassroomInfoServiceImpl.java   |  3 +
 .../mapper/train/TrainClassroomInfoMapper.xml | 10 ++-
 build_ui/src/views/train/classroom/index.vue  | 89 ++++++++++++++++++-
 3 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainClassroomInfoServiceImpl.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainClassroomInfoServiceImpl.java
index 468ef08ef..0c6357bd1 100644
--- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainClassroomInfoServiceImpl.java
+++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainClassroomInfoServiceImpl.java
@@ -57,6 +57,9 @@ public class TrainClassroomInfoServiceImpl implements ITrainClassroomInfoService
         vo.setRoomStatus(classroom.getRoomStatus());
         vo.setRemark(classroom.getRemark());
         vo.setCreateTime(classroom.getCreateTime());
+        vo.setSeatArrange(classroom.getSeatArrange());
+        vo.setMultimedia(classroom.getMultimedia());
+        vo.setProjector(classroom.getProjector());
 
         // 按 bind_classroom_id 查询绑定的电子班牌（0..N），映射为轻量摘要 VO，无绑定时返回空列表 []
         TrainElectronicBoard boardQuery = new TrainElectronicBoard();
diff --git a/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainClassroomInfoMapper.xml b/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainClassroomInfoMapper.xml
index e1097a93f..bb9d540fa 100644
--- a/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainClassroomInfoMapper.xml
+++ b/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainClassroomInfoMapper.xml
@@ -29,9 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTrainClassroomInfoVo"/>
         where del_flag = '0'
         <if test="roomName != null  and roomName != ''"> and room_name like concat('%', #{roomName}, '%')</if>
-        <if test="roomLocation != null  and roomLocation != ''"> and room_location = #{roomLocation}</if>
+        <if test="roomLocation != null  and roomLocation != ''"> and room_location like concat('%', #{roomLocation}, '%')</if>
         <if test="capacity != null "> and capacity = #{capacity}</if>
         <if test="roomStatus != null "> and room_status = #{roomStatus}</if>
+        <if test="multimedia != null "> and multimedia = #{multimedia}</if>
+        <if test="projector != null "> and projector = #{projector}</if>
         <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
         order by create_time desc
     </select>
@@ -80,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="seatArrange != null">#{seatArrange}</if>
-            <if test="multimedia != null">#{multimedia}</if>
-            <if test="projector != null">#{projector}</if>
+            <if test="seatArrange != null">#{seatArrange},</if>
+            <if test="multimedia != null">#{multimedia},</if>
+            <if test="projector != null">#{projector},</if>
          </trim>
     </insert>
 
diff --git a/build_ui/src/views/train/classroom/index.vue b/build_ui/src/views/train/classroom/index.vue
index 86f3b04e1..a764dc366 100644
--- a/build_ui/src/views/train/classroom/index.vue
+++ b/build_ui/src/views/train/classroom/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
+    <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="88px">
       <el-form-item label="教室名称" prop="roomName">
         <el-input
           v-model="queryParams.roomName"
@@ -24,6 +24,26 @@
           <el-option label="维护中" :value="2" />
         </el-select>
       </el-form-item>
+      <el-form-item label="具备多媒体" prop="multimedia">
+        <el-select v-model="queryParams.multimedia" placeholder="具备多媒体" clearable>
+          <el-option
+            v-for="dict in yesNoOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="具备投影" prop="projector">
+        <el-select v-model="queryParams.projector" placeholder="具备投影" clearable>
+          <el-option
+            v-for="dict in yesNoOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -71,7 +91,17 @@
           <el-tag v-else type="info">维护中</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="具备多媒体" align="center" prop="multimedia">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.train_yes_no" :value="scope.row.multimedia" />
+        </template>
+      </el-table-column>
+      <el-table-column label="具备投影" align="center" prop="projector">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.train_yes_no" :value="scope.row.projector" />
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
         <template slot-scope="scope">
           <el-button
@@ -120,6 +150,24 @@
             <el-radio :label="2">维护中</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="具备多媒体" prop="multimedia">
+          <el-radio-group v-model="form.multimedia">
+            <el-radio
+              v-for="dict in yesNoOptions"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="具备投影" prop="projector">
+          <el-radio-group v-model="form.projector">
+            <el-radio
+              v-for="dict in yesNoOptions"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="500" />
         </el-form-item>
@@ -137,6 +185,8 @@ import { listClassroom, getClassroom, addClassroom, updateClassroom, delClassroo
 
 export default {
   name: 'Classroom',
+  // 是否类字典（sys_yes_no），注入后可通过 dict.type.sys_yes_no 访问
+  dicts: ['sys_yes_no', 'train_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -164,7 +214,9 @@ export default {
         roomName: null,
         roomLocation: null,
         capacity: null,
-        roomStatus: null
+        roomStatus: null,
+        multimedia: null,
+        projector: null
       },
       // 表单参数
       form: {},
@@ -191,10 +243,35 @@ export default {
       }
     }
   },
+  computed: {
+    /*
+     * 是否（sys_yes_no）单选选项。
+     * 数据库 multimedia / projector 为数值型（1=是，0=否），
+     * 字典 dictValue 为 Y/N 字符串，此处统一转换为数值，保证回显与提交类型一致。
+     */
+    yesNoOptions() {
+      const list = (this.dict && this.dict.type && this.dict.type.train_yes_no) || []
+      return list.map(item => ({
+        label: item.label,
+        //value: this.toYesNoValue(item.value)
+        value: /^\d+$/.test(String(item.value)) ? Number(item.value) : item.value
+      }))
+    }
+  },
   created() {
     this.getList()
   },
   methods: {
+    /** 是否值归一化：Y->1，N->0，纯数字字符串转 Number */
+    toYesNoValue(value) {
+      if (value === null || value === undefined || value === '') {
+        return null
+      }
+      const text = String(value)
+      if (text === 'Y' || text === 'y') return 1
+      if (text === 'N' || text === 'n') return 0
+      return /^\d+$/.test(text) ? Number(text) : value
+    },
     /** 查询教室信息列表 */
     getList() {
       this.loading = true
@@ -217,6 +294,8 @@ export default {
         roomLocation: null,
         capacity: 50,
         roomStatus: 1,
+        multimedia: 0,
+        projector: 0,
         remark: null
       }
       this.resetForm('form')
@@ -249,6 +328,10 @@ export default {
       const classRoomId = row.classRoomId || this.ids
       getClassroom(classRoomId).then(response => {
         this.form = response.data
+        console.log("multimedia==="+this.form.multimedia);
+          // 归一化是否值，保证与单选选项（数值）类型一致，避免回显不选中
+        //this.$set(this.form, 'multimedia', /^\d+$/.test(String(this.form.multimedia)) ? Number(this.form.multimedia) : this.form.multimedia)
+        //this.$set(this.form, 'projector', /^\d+$/.test(String(this.form.projector)) ? Number(this.form.projector) : this.form.projector)
         this.open = true
         this.title = '修改教室信息'
       })