diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainClassroomInfo.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainClassroomInfo.java
index 1733539bc..3405afa9e 100644
--- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainClassroomInfo.java
+++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainClassroomInfo.java
@@ -46,6 +46,12 @@ public class TrainClassroomInfo extends BaseEntity
/** 删除标志 (0代表存在 2代表删除) */
private String delFlag;
+ private Integer multimedia;
+
+ private Integer projector;
+
+ private String seatArrange;
+
public void setClassRoomId(String classRoomId)
{
this.classRoomId = classRoomId;
@@ -106,6 +112,30 @@ public class TrainClassroomInfo extends BaseEntity
return delFlag;
}
+ public Integer getMultimedia() {
+ return multimedia;
+ }
+
+ public void setMultimedia(Integer multimedia) {
+ this.multimedia = multimedia;
+ }
+
+ public Integer getProjector() {
+ return projector;
+ }
+
+ public void setProjector(Integer projector) {
+ this.projector = projector;
+ }
+
+ public String getSeatArrange() {
+ return seatArrange;
+ }
+
+ public void setSeatArrange(String seatArrange) {
+ this.seatArrange = seatArrange;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -120,6 +150,9 @@ public class TrainClassroomInfo extends BaseEntity
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
+ .append("multimedia", getMultimedia())
+ .append("projector", getProjector())
+ .append("seatArrange", getSeatArrange())
.toString();
}
}
diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/ClassroomCreateDTO.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/ClassroomCreateDTO.java
index 8e1758ed7..77f9938ae 100644
--- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/ClassroomCreateDTO.java
+++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/ClassroomCreateDTO.java
@@ -32,6 +32,12 @@ public class ClassroomCreateDTO implements Serializable
/** 教室状态 (0: 正在使用, 1: 可用空闲, 2: 维护中) */
private Integer roomStatus;
+ private Integer multimedia;
+
+ private Integer projector;
+
+ private String seatArrange;
+
/** 备注 */
@Size(max = 500, message = "备注长度不能超过500个字符")
private String remark;
@@ -85,4 +91,28 @@ public class ClassroomCreateDTO implements Serializable
{
this.remark = remark;
}
+
+ public Integer getMultimedia() {
+ return multimedia;
+ }
+
+ public void setMultimedia(Integer multimedia) {
+ this.multimedia = multimedia;
+ }
+
+ public Integer getProjector() {
+ return projector;
+ }
+
+ public void setProjector(Integer projector) {
+ this.projector = projector;
+ }
+
+ public String getSeatArrange() {
+ return seatArrange;
+ }
+
+ public void setSeatArrange(String seatArrange) {
+ this.seatArrange = seatArrange;
+ }
}
diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/ClassroomDetailVO.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/ClassroomDetailVO.java
index 32e35ce66..d389575c1 100644
--- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/ClassroomDetailVO.java
+++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/ClassroomDetailVO.java
@@ -40,6 +40,12 @@ public class ClassroomDetailVO implements Serializable
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ private String seatArrange;
+
+ private Integer multimedia;
+
+ private Integer projector;
+
public String getClassRoomId()
{
return classRoomId;
@@ -119,4 +125,28 @@ public class ClassroomDetailVO implements Serializable
{
this.createTime = createTime;
}
+
+ public String getSeatArrange() {
+ return seatArrange;
+ }
+
+ public void setSeatArrange(String seatArrange) {
+ this.seatArrange = seatArrange;
+ }
+
+ public Integer getMultimedia() {
+ return multimedia;
+ }
+
+ public void setMultimedia(Integer multimedia) {
+ this.multimedia = multimedia;
+ }
+
+ public Integer getProjector() {
+ return projector;
+ }
+
+ public void setProjector(Integer projector) {
+ this.projector = projector;
+ }
}
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 4dcfe990f..e1097a93f 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
@@ -16,10 +16,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
- select class_room_id, room_name, room_location, capacity, room_status, del_flag, create_by, create_time, update_by, update_time, remark from train_classroom_info
+ select class_room_id, room_name, room_location, capacity, room_status, del_flag, create_by, create_time, update_by, update_time, remark, seat_arrange, multimedia, projector from train_classroom_info