diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/StudentInfoServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/StudentInfoServiceImpl.java index 915ae51c..f8553524 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/StudentInfoServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/StudentInfoServiceImpl.java @@ -56,7 +56,9 @@ public class StudentInfoServiceImpl implements IStudentInfoService { queryWrapper.orderByDesc("id"); studentInfoMapper.setSearch(queryWrapper, searchValidate, new String[]{ - "=:userId@user_id:str", + "=:userId@user_id:int", + "like:name@name:str", + "=:gender@gender:int", "=:studentNumber@student_number:str", "=:college:str", "=:major:str", @@ -79,7 +81,7 @@ public class StudentInfoServiceImpl implements IStudentInfoService { "=:scholarshipLevel@scholarship_level:str", "=:academicWarnings@academic_warnings:str", "=:isVerified@is_verified:str", - "=:verifiedBy@verified_by:str", + "=:verifiedBy@verified_by:", "=:verifiedTime@verified_time:str", }); IPage iPage = studentInfoMapper.selectPage(new Page<>(page, limit), queryWrapper); @@ -135,6 +137,9 @@ public class StudentInfoServiceImpl implements IStudentInfoService { public void add(StudentInfoCreateValidate createValidate) { StudentInfo model = new StudentInfo(); model.setUserId(createValidate.getUserId()); + User user = userMapper.selectOne(new QueryWrapper().eq("id", model.getUserId())); + model.setName(user.getRealName()); + model.setGender(user.getSex()); model.setStudentNumber(createValidate.getStudentNumber()); model.setCollege(createValidate.getCollege()); model.setMajor(createValidate.getMajor()); @@ -181,6 +186,9 @@ public class StudentInfoServiceImpl implements IStudentInfoService { model.setId(updateValidate.getId()); model.setUserId(updateValidate.getUserId()); + User user = userMapper.selectOne(new QueryWrapper().eq("id", model.getUserId())); + model.setName(user.getRealName()); + model.setGender(user.getSex()); model.setStudentNumber(updateValidate.getStudentNumber()); model.setCollege(updateValidate.getCollege()); model.setMajor(updateValidate.getMajor()); diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoSearchValidate.java index 0b16cb8a..d4585552 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoSearchValidate.java @@ -2,6 +2,7 @@ package com.mdd.admin.validate.student; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; @@ -15,6 +16,12 @@ public class StudentInfoSearchValidate implements Serializable { @ApiModelProperty(value = "关联用户ID") private String userId; + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "性别") + private Integer gender; + @ApiModelProperty(value = "学号") private String studentNumber; diff --git a/server/like-common/src/main/java/com/mdd/common/entity/StudentInfo.java b/server/like-common/src/main/java/com/mdd/common/entity/StudentInfo.java index 9b5d234b..9c15ad66 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/StudentInfo.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/StudentInfo.java @@ -20,6 +20,12 @@ public class StudentInfo implements Serializable { @ApiModelProperty(value = "主键") private Integer id; + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "性别") + private Integer gender; + @ApiModelProperty(value = "关联用户ID") private Integer userId; diff --git a/sql/install.sql b/sql/install.sql index bee296d4..9724350b 100644 --- a/sql/install.sql +++ b/sql/install.sql @@ -1217,8 +1217,10 @@ COMMIT; SET FOREIGN_KEY_CHECKS = 1; -CREATE TABLE `student_info` ( +CREATE TABLE `la_student_info` ( `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', + `name` varchar(50) NOT NULL DEFAULT '姓名错误' COMMENT '姓名', + `gender` tinyint unsigned NOT NULL DEFAULT '' COMMENT '性别 1-男 2-女', `user_id` int unsigned NOT NULL DEFAULT '0' COMMENT '关联用户ID', `student_number` varchar(32) NOT NULL DEFAULT '' COMMENT '学号', `college` varchar(100) NOT NULL DEFAULT '' COMMENT '学院', @@ -1442,6 +1444,7 @@ CREATE TABLE `la_semester_config` ( CREATE TABLE `la_teacher` ( `id` int unsigned NOT NULL AUTO_INCREMENT, `admin_id` int unsigned NOT NULL COMMENT '关联管理员ID', + `name` varchar(50) NOT NULL DEFAULT '' COMMENT '姓名', `teacher_code` varchar(50) NOT NULL DEFAULT '' COMMENT '教师工号', `title` varchar(50) NOT NULL DEFAULT '' COMMENT '职称', `department_id` int unsigned DEFAULT NULL COMMENT '所属院系ID',