diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainTrainingSite.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainTrainingSite.java index fd705060f..801073da4 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainTrainingSite.java +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainTrainingSite.java @@ -50,6 +50,10 @@ public class TrainTrainingSite extends BaseEntity /** 删除标志 (0代表存在 2代表删除) */ private String delFlag; + private String major; + + private String seatArrange; + public void setSiteId(String siteId) { this.siteId = siteId; @@ -120,6 +124,22 @@ public class TrainTrainingSite extends BaseEntity return delFlag; } + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } + + 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) @@ -135,6 +155,8 @@ public class TrainTrainingSite extends BaseEntity .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) + .append("major", getMajor()) + .append("seatArrange", getSeatArrange()) .toString(); } } diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/SiteCreateDTO.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/SiteCreateDTO.java index 6744760d5..a2791e807 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/SiteCreateDTO.java +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/SiteCreateDTO.java @@ -39,6 +39,10 @@ public class SiteCreateDTO implements Serializable @Size(max = 500, message = "备注长度不能超过500个字符") private String remark; + private String seatArrange; + + private String major; + public String getSiteName() { return siteName; @@ -98,4 +102,20 @@ public class SiteCreateDTO implements Serializable { this.remark = remark; } + + public String getSeatArrange() { + return seatArrange; + } + + public void setSeatArrange(String seatArrange) { + this.seatArrange = seatArrange; + } + + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } } diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/SiteDetailVO.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/SiteDetailVO.java index 082eb7b49..bfe3b6111 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/SiteDetailVO.java +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/SiteDetailVO.java @@ -38,6 +38,10 @@ public class SiteDetailVO implements Serializable @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + private String seatArrange; + + private String major; + public String getSiteId() { return siteId; @@ -117,4 +121,20 @@ public class SiteDetailVO implements Serializable { this.createTime = createTime; } + + public String getSeatArrange() { + return seatArrange; + } + + public void setSeatArrange(String seatArrange) { + this.seatArrange = seatArrange; + } + + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } } diff --git a/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainTrainingSiteMapper.xml b/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainTrainingSiteMapper.xml index 12a52116c..00656ba4a 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainTrainingSiteMapper.xml +++ b/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainTrainingSiteMapper.xml @@ -17,10 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select site_id, site_name, site_location, capacity, site_device, site_status, del_flag, create_by, create_time, update_by, update_time, remark from train_training_site + select site_id, site_name, site_location, capacity, site_device, site_status, del_flag, create_by, create_time, update_by, update_time, remark, major, seat_arrange from train_training_site