diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql index 8839f6fe..6812e461 100644 --- a/doc/sql/mysql/tianze-pro-update.sql +++ b/doc/sql/mysql/tianze-pro-update.sql @@ -494,3 +494,6 @@ alter table question_log_summary comment '学生-题目日志-分析汇总'; ALTER TABLE teacher_open_course_question_setting ADD COLUMN teacher_open_course_merge_course_info_id bigint(20) COMMENT '关联的章节ID（仅章节练习有值）'; ALTER TABLE teacher_open_course_merge_resources_info ADD COLUMN resources_info_status int(2) COMMENT '资源状态 0 删除 1上架 2下架'; +ALTER TABLE student ADD COLUMN student_gender int(2) COMMENT '性别 -1 未知 1男 2女'; + +ALTER TABLE teacher ADD COLUMN teacher_gender int(2) COMMENT '性别 -1 未知 1男 2女'; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Student.java b/web/src/main/java/com/ibeetl/jlw/entity/Student.java index 1cdb4c78..35d725c3 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Student.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Student.java @@ -5,6 +5,7 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.DictDeep; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.enums.MenuEnums; +import com.ibeetl.jlw.enums.GenderEnum; import org.beetl.sql.annotation.entity.AutoID; import org.beetl.sql.annotation.entity.InsertIgnore; import org.beetl.sql.annotation.entity.UpdateIgnore; @@ -49,7 +50,11 @@ public class Student extends BaseEntity implements AbstractToken { //学生邮箱 private String studentEmail ; - + + //性别 + + private GenderEnum studentGender ; + //状态(1正常 2删除) private Integer studentStatus ; @@ -268,4 +273,12 @@ public class Student extends BaseEntity implements AbstractToken { public MenuEnums getIdentity() { return MenuEnums.JT_S_03; } + + public GenderEnum getStudentGender() { + return studentGender; + } + + public void setStudentGender(GenderEnum studentGender) { + this.studentGender = studentGender; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java index 364ac8ac..1c979566 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java @@ -4,6 +4,7 @@ import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.enums.MenuEnums; +import com.ibeetl.jlw.enums.GenderEnum; import org.beetl.sql.annotation.entity.AutoID; import javax.validation.constraints.NotBlank; @@ -58,7 +59,11 @@ public class Teacher extends BaseEntity implements AbstractToken { //教师邮箱 private String teacherEmail ; - + + //性别 + + private GenderEnum teacherGender ; + //状态(1正常 2删除) private Integer teacherStatus ; @@ -270,4 +275,12 @@ public class Teacher extends BaseEntity implements AbstractToken { public void setUniversityFacultyId(Long universityFacultyId) { this.universityFacultyId = universityFacultyId; } + + public GenderEnum getTeacherGender() { + return teacherGender; + } + + public void setTeacherGender(GenderEnum teacherGender) { + this.teacherGender = teacherGender; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/enums/GenderEnum.java b/web/src/main/java/com/ibeetl/jlw/enums/GenderEnum.java new file mode 100644 index 00000000..81242378 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/enums/GenderEnum.java @@ -0,0 +1,25 @@ +package com.ibeetl.jlw.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.beetl.sql.annotation.entity.EnumMapping; +import org.beetl.sql.annotation.entity.EnumValue; + +/** + * 上下架状态 + * + * @author mlx + */ +@Getter +@EnumMapping("name") +@AllArgsConstructor +public enum GenderEnum { + + MAN(1, "男"), + WOMAN(2, "女"), + UN_KNOW(-1, "未知"); + + @EnumValue + private Integer code; + private String text; +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java index 1040e026..58f032c3 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java @@ -3,10 +3,14 @@ package com.ibeetl.jlw.web.query; import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.Student; +import com.ibeetl.jlw.enums.GenderEnum; import java.util.Date; import java.util.List; +import static cn.hutool.core.util.ObjectUtil.defaultIfNull; +import static com.ibeetl.jlw.enums.GenderEnum.UN_KNOW; + /** *Student查询 */ @@ -23,6 +27,9 @@ public class StudentQuery extends PageParam { private String studentMobile; @Query(name = "学生邮箱", display = false) private String studentEmail; + + @Query(name = "学生性别", display = false) + private GenderEnum studentGender; @Query(name = "学生头像", display = false) private String headImg; @Query(name = "状态(1正常 2删除)", display = false) @@ -192,6 +199,14 @@ public class StudentQuery extends PageParam { this.studentSnOrName = studentSnOrName; } + public GenderEnum getStudentGender() { + return studentGender; + } + + public void setStudentGender(GenderEnum studentGender) { + this.studentGender = studentGender; + } + public static class StudentTemp{ //临时学生类 private Long studentsId; @@ -307,6 +322,7 @@ public class StudentQuery extends PageParam { pojo.setStudentSn(this.getStudentSn()); pojo.setStudentMobile(this.getStudentMobile()); pojo.setStudentEmail(this.getStudentEmail()); + pojo.setStudentGender(defaultIfNull(this.getStudentGender(), UN_KNOW)); pojo.setStudentStatus(this.getStudentStatus()); pojo.setStudentPassword(this.getStudentPassword()); pojo.setAddTime(this.getAddTime()); @@ -314,6 +330,7 @@ public class StudentQuery extends PageParam { pojo.setUserId(this.getUserId()); pojo.setHeadImg(this.getHeadImg()); pojo.setStudentWeixinInfo(this.getStudentWeixinInfo()); + pojo.setStudentWeixinInfo(this.getStudentWeixinInfo()); return pojo; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherQuery.java index b3c33544..60aa72a8 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherQuery.java @@ -3,6 +3,7 @@ package com.ibeetl.jlw.web.query; import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.Teacher; +import com.ibeetl.jlw.enums.GenderEnum; import java.util.Date; @@ -31,6 +32,8 @@ public class TeacherQuery extends PageParam { private String teacherMobile; @Query(name = "教师邮箱", display = false) private String teacherEmail; + @Query(name = "性别", display = false) + private GenderEnum teacherGender ; @Query(name = "状态(1正常 2删除)", display = false) private Integer teacherStatus; @Query(name = "教师密码", display = false) @@ -168,6 +171,7 @@ public class TeacherQuery extends PageParam { pojo.setUserId(this.getUserId()); pojo.setUniversityFacultyId(this.getUniversityFacultyId()); pojo.setUniversitySystemId(this.getUniversitySystemId()); + pojo.setTeacherGender(this.getTeacherGender()); return pojo; } @@ -242,4 +246,12 @@ public class TeacherQuery extends PageParam { public void setUniversitySystemId(Long universitySystemId) { this.universitySystemId = universitySystemId; } + + public GenderEnum getTeacherGender() { + return teacherGender; + } + + public void setTeacherGender(GenderEnum teacherGender) { + this.teacherGender = teacherGender; + } } diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md index 43ab4994..5a25d9a7 100644 --- a/web/src/main/resources/sql/jlw/student.md +++ b/web/src/main/resources/sql/jlw/student.md @@ -201,6 +201,9 @@ queryByConditionQuery @if(!isEmpty(studentStatus)){ and t.student_status =#studentStatus# @} + @if(!isEmpty(studentGender)){ + and t.student_gender =#studentGender# + @} @if(!isEmpty(studentStatuses)){ and find_in_set(t.student_status,#studentStatuses#) @} @@ -315,6 +318,9 @@ queryByCondition2Student @if(!isEmpty(studentStatus)){ and t.student_status =#studentStatus# @} + @if(!isEmpty(studentGender)){ + and t.student_gender =#studentGender# + @} @if(!isEmpty(studentStatuses)){ and find_in_set(t.student_status,#studentStatuses#) @} @@ -559,6 +565,9 @@ getExcelValues2Competition @if(!isEmpty(studentStatus)){ and t.student_status =#studentStatus# @} + @if(!isEmpty(studentGender)){ + and t.student_gender =#studentGender# + @} @if(!isEmpty(studentPassword)){ and t.student_password =#studentPassword# @} @@ -687,6 +696,9 @@ getExcelValues2Competition @if(!isEmpty(studentStatus)){ and t.student_status =#studentStatus# @} + @if(!isEmpty(studentGender)){ + and t.student_gender =#studentGender# + @} @if(!isEmpty(studentPassword)){ and t.student_password =#studentPassword# @} @@ -780,6 +792,9 @@ getStudentValues @if(!isEmpty(studentStatus)){ and t.student_status =#studentStatus# @} + @if(!isEmpty(studentGender)){ + and t.student_gender =#studentGender# + @} @if(!isEmpty(studentPassword)){ and t.student_password =#studentPassword# @} @@ -839,6 +854,9 @@ getValuesByQuery @if(!isEmpty(studentStatus)){ and t.student_status =#studentStatus# @} + @if(!isEmpty(studentGender)){ + and t.student_gender =#studentGender# + @} @if(!isEmpty(studentStatuses)){ and find_in_set(t.student_status,#studentStatuses#) @}