From 989f549c5a7d12c69a207f3d1ed8318c0c3bac5d Mon Sep 17 00:00:00 2001 From: buliping Date: Mon, 28 Sep 2026 11:03:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=91=98=E4=BF=A1=E6=81=AF=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A02=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=9A?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=9C=B0=E5=9D=80avatar,=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E7=BA=A7=E5=88=ABduty=5Flevel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/train/domain/TrainStudent.java | 22 +++++++++++++++++++ .../train/domain/dto/StudentCreateDTO.java | 19 ++++++++++++++++ .../train/domain/vo/StudentDetailVO.java | 20 +++++++++++++++++ .../ruoyi/train/domain/vo/StudentItemVO.java | 20 +++++++++++++++++ .../mapper/train/TrainStudentMapper.xml | 11 +++++++--- 5 files changed, 89 insertions(+), 3 deletions(-) diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainStudent.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainStudent.java index f955ccbce..4df2cd266 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainStudent.java +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainStudent.java @@ -42,6 +42,10 @@ public class TrainStudent extends BaseEntity private Integer status; private String delFlag; + private String avatar; + + private Integer dutyLevel; + public String getsId() { return sId; @@ -194,6 +198,22 @@ public class TrainStudent extends BaseEntity this.delFlag = delFlag; } + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public Integer getDutyLevel() { + return dutyLevel; + } + + public void setDutyLevel(Integer dutyLevel) { + this.dutyLevel = dutyLevel; + } + /** * 安全日志表示：刻意不包含身份证密文、查重值或任何完整身份证信息。 */ @@ -219,6 +239,8 @@ public class TrainStudent extends BaseEntity .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) + .append("dutyLevel", getDutyLevel()) + .append("avatar", getAvatar()) .toString(); } } diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/StudentCreateDTO.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/StudentCreateDTO.java index a8d100e51..e892ca896 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/StudentCreateDTO.java +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/StudentCreateDTO.java @@ -46,6 +46,9 @@ public class StudentCreateDTO implements Serializable @Size(max = 500, message = "备注长度不能超过500个字符") private String remark; + private Integer dutyLevel; + private String avatar; + public String getsName() { return sName; } public void setsName(String sName) { this.sName = sName; } public String getsGender() { return sGender; } @@ -65,6 +68,22 @@ public class StudentCreateDTO implements Serializable public String getRemark() { return remark; } public void setRemark(String remark) { this.remark = remark; } + public Integer getDutyLevel() { + return dutyLevel; + } + + public void setDutyLevel(Integer dutyLevel) { + this.dutyLevel = dutyLevel; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + @Override public String toString() { diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/StudentDetailVO.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/StudentDetailVO.java index f2b390858..ad36e7334 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/StudentDetailVO.java +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/StudentDetailVO.java @@ -14,6 +14,10 @@ public class StudentDetailVO extends StudentItemVO @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + private Integer dutyLevel; + + private String avatar; + public String getFaceRef() { return faceRef; } public void setFaceRef(String faceRef) { this.faceRef = faceRef; } public String getRemark() { return remark; } @@ -22,4 +26,20 @@ public class StudentDetailVO extends StudentItemVO public void setCreateBy(String createBy) { this.createBy = createBy; } public Date getCreateTime() { return createTime; } public void setCreateTime(Date createTime) { this.createTime = createTime; } + + public Integer getDutyLevel() { + return dutyLevel; + } + + public void setDutyLevel(Integer dutyLevel) { + this.dutyLevel = dutyLevel; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } } diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/StudentItemVO.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/StudentItemVO.java index afe69246e..62ed8fee2 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/StudentItemVO.java +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/StudentItemVO.java @@ -22,6 +22,10 @@ public class StudentItemVO implements Serializable private Integer sourceType; private Integer status; + private String avatar; + + private Integer dutyLevel; + public String getsId() { return sId; } public void setsId(String sId) { this.sId = sId; } public String getsName() { return sName; } @@ -44,4 +48,20 @@ public class StudentItemVO implements Serializable public void setSourceType(Integer sourceType) { this.sourceType = sourceType; } public Integer getStatus() { return status; } public void setStatus(Integer status) { this.status = status; } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public Integer getDutyLevel() { + return dutyLevel; + } + + public void setDutyLevel(Integer dutyLevel) { + this.dutyLevel = dutyLevel; + } } diff --git a/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainStudentMapper.xml b/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainStudentMapper.xml index 825a4d715..3f5a5b449 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainStudentMapper.xml +++ b/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainStudentMapper.xml @@ -25,12 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select s_id, s_name, s_gender, s_birth, user_id, org_name, s_phone, s_email, id_card_ciphertext, id_card_hash, id_card_last4, face_ref, source_type, - status, create_by, create_time, update_by, update_time, remark, del_flag + status, create_by, create_time, update_by, update_time, remark, del_flag, + avatar, duty_level from train_student @@ -77,11 +80,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into train_student ( s_id, s_name, s_gender, s_birth, user_id, org_name, s_phone, s_email, id_card_ciphertext, id_card_hash, id_card_last4, face_ref, source_type, - status, create_by, create_time, update_by, update_time, remark, del_flag + status, create_by, create_time, update_by, update_time, remark, del_flag, + avatar, duty_level ) values ( #{sId}, #{sName}, #{sGender}, #{sBirth}, #{userId}, #{orgName}, #{sPhone}, #{sEmail}, #{idCardCiphertext}, #{idCardHash}, #{idCardLast4}, #{faceRef}, #{sourceType}, - #{status}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}, #{delFlag} + #{status}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}, #{delFlag}, + #{avatar}, #{dutyLevel} )