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" where del_flag = '0' and room_name like concat('%', #{roomName}, '%') - and room_location = #{roomLocation} + and room_location like concat('%', #{roomLocation}, '%') and capacity = #{capacity} and room_status = #{roomStatus} + and multimedia = #{multimedia} + and projector = #{projector} and create_by = #{createBy} order by create_time desc @@ -80,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, - #{seatArrange} - #{multimedia} - #{projector} + #{seatArrange}, + #{multimedia}, + #{projector}, 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 @@ - + + + + + + +