diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/train/TrainStudentController.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/train/TrainStudentController.java index 2a2ae102a..8996242dd 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/train/TrainStudentController.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/train/TrainStudentController.java @@ -5,7 +5,6 @@ import java.util.regex.Pattern; import javax.validation.Valid; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.train.domain.TrainTeacher; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/StudentUpdateDTO.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/StudentUpdateDTO.java new file mode 100644 index 000000000..b0bfb97ca --- /dev/null +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/dto/StudentUpdateDTO.java @@ -0,0 +1,36 @@ +package com.ruoyi.train.domain.dto; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; + +/** + * 学员手工修改请求。 + * + *
复用 {@link StudentCreateDTO} 的可编辑字段与校验规则,额外要求携带学员主键 sId。 + * 身份证号沿用「只写不读」策略:未提交时保留库内既有密文,不做清空。
+ */ +public class StudentUpdateDTO extends StudentCreateDTO +{ + private static final long serialVersionUID = 1L; + + @NotBlank(message = "学员ID不能为空") + @Size(max = 64, message = "学员ID长度不能超过64个字符") + private String sId; + + public String getsId() + { + return sId; + } + + public void setsId(String sId) + { + this.sId = sId; + } + + @Override + public String toString() + { + return "StudentUpdateDTO{sId='" + sId + "', sName='" + getsName() + + "', idCardProvided=" + (getIdCard() != null) + "}"; + } +} diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainStudentServiceImpl.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainStudentServiceImpl.java index eed2c9ccf..b7f6bb278 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainStudentServiceImpl.java +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainStudentServiceImpl.java @@ -101,6 +101,7 @@ public class TrainStudentServiceImpl implements ITrainStudentService student.setsPhone(trimToNull(dto.getsPhone())); student.setsEmail(trimToNull(dto.getsEmail())); student.setAvatar(trimToNull(dto.getAvatar())); + student.setDutyLevel(dto.getDutyLevel()); if (normalizedIdCard != null) { diff --git a/build_ui/src/views/train/student/index.vue b/build_ui/src/views/train/student/index.vue index 0621cbe3a..f595a51e7 100644 --- a/build_ui/src/views/train/student/index.vue +++ b/build_ui/src/views/train/student/index.vue @@ -175,10 +175,18 @@