From 5aace0e98709fa50f2811d09e95ed90ff1fcd72d Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Wed, 16 Jul 2025 16:57:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E7=94=9F=E6=B3=A8=E5=86=8C=E6=97=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yf/exam/config/ShiroConfig.java | 2 + .../com/yf/exam/modules/exam/dto/ExamDTO.java | 4 +- .../modules/exam/dto/ExamRegistrationDTO.java | 93 +--------------- .../exam/dto/request/ExamSearchDTO.java | 4 +- .../com/yf/exam/modules/exam/entity/Exam.java | 2 +- .../modules/exam/entity/ExamRegistration.java | 78 +------------ .../modules/exam/entity/UserAttachment.java | 104 ++++++++++++++++++ .../exam/service/impl/ExamServiceImpl.java | 2 - .../yf/exam/modules/paper/enums/ExamType.java | 2 + .../paper/service/impl/PaperServiceImpl.java | 4 +- .../exam/modules/sys/user/dto/SysUserDTO.java | 3 +- .../user/dto/response/SysUserLoginDTO.java | 3 +- .../exam/modules/sys/user/entity/SysUser.java | 7 +- .../sys/user/mapper/SysUserMapper.java | 6 + .../user/service/impl/SysUserServiceImpl.java | 58 +++++----- .../user/exam/dto/request/UserExamReqDTO.java | 4 +- .../exam/dto/response/UserExamRespDTO.java | 4 +- .../main/resources/mapper/exam/ExamMapper.xml | 2 +- .../mapper/sys/user/SysUserMapper.xml | 33 +++++- 19 files changed, 201 insertions(+), 214 deletions(-) create mode 100644 exam-admin/src/main/java/com/yf/exam/modules/exam/entity/UserAttachment.java diff --git a/exam-admin/src/main/java/com/yf/exam/config/ShiroConfig.java b/exam-admin/src/main/java/com/yf/exam/config/ShiroConfig.java index ca4d096..0f0e63a 100644 --- a/exam-admin/src/main/java/com/yf/exam/config/ShiroConfig.java +++ b/exam-admin/src/main/java/com/yf/exam/config/ShiroConfig.java @@ -53,6 +53,8 @@ public class ShiroConfig { // 获取网站基本信息 map.put("/exam/api/sys/config/detail", "anon"); + // 文件上传 + map.put("/exam/api/file/upload", "anon"); // 文件读取 map.put("/upload/file/**", "anon"); diff --git a/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/ExamDTO.java b/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/ExamDTO.java index 03511eb..4704d72 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/ExamDTO.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/ExamDTO.java @@ -41,9 +41,9 @@ public class ExamDTO implements Serializable { private Integer openType; /** - * 考试类型（1：模拟考试，2：正式考试） + * 考试类型（1：模拟考试，2：正式考试，3：补考） * */ - @ApiModelProperty(value = "考试类型（1：模拟考试，2：正式考试）", required=true) + @ApiModelProperty(value = "考试类型（1：模拟考试，2：正式考试，3：补考）", required=true) private Integer examType; diff --git a/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/ExamRegistrationDTO.java b/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/ExamRegistrationDTO.java index 0b85c28..56bea63 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/ExamRegistrationDTO.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/ExamRegistrationDTO.java @@ -1,6 +1,7 @@ package com.yf.exam.modules.exam.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yf.exam.modules.exam.entity.UserAttachment; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; @@ -15,7 +16,7 @@ import org.springframework.format.annotation.DateTimeFormat; **/ @Data @ApiModel(value="报名", description="报名") -public class ExamRegistrationDTO implements Serializable { +public class ExamRegistrationDTO extends UserAttachment implements Serializable { private static final long serialVersionUID = 1L; @@ -61,96 +62,6 @@ public class ExamRegistrationDTO implements Serializable { @ApiModelProperty(value = "考试名称", required=true) private String title; - /** - * 电子邮箱 - */ - @ApiModelProperty(value = "电子邮箱", required=true) - private String email; - - /** - * 通讯地址 - */ - @ApiModelProperty(value = "通讯地址", required=true) - private String address; - - /** - * 最高学历,1:初中,2:高中/中专,3:大专及以上 - */ - @ApiModelProperty(value = "最高学历,1:初中,2:高中/中专,3:大专及以上", required=true) - private Integer education; - - /** - * 毕业院校 - */ - @ApiModelProperty(value = "毕业院校", required=true) - private String graduateSchool; - - /** - * 专业 - */ - @ApiModelProperty(value = "专业", required=true) - private String major; - - /** - * 报考类别（1：普通医疗护理员，2:老年医疗护理员，3：孕产妇和新生儿医疗护理员） - */ - @ApiModelProperty(value = "报考类别（1：普通医疗护理员，2:老年医疗护理员，3：孕产妇和新生儿医疗护理员）", required=true) - private Integer regType; - - /** - * 培训机构 - */ - @ApiModelProperty(value = "培训机构") - private String trainInstitution; - - /** - * 培训开始时间 - */ - @ApiModelProperty(value = "培训开始时间") - private LocalDate trainStartDate; - - /** - * 培训结束时间 - */ - @ApiModelProperty(value = "培训结束时间") - private LocalDate trainEndDate; - - /** - * 身份证正面照片 - */ - @ApiModelProperty(value = "身份证正面照片") - private String cardFront; - - /** - * 身份证背面照片 - */ - @ApiModelProperty(value = "身份证背面照片") - private String cardBack; - - /** - * 身份证正反面复印件 - */ - @ApiModelProperty(value = "身份证正反面复印件") - private String cardCopy; - - /** - * 证件照 - */ - @ApiModelProperty(value = "证件照", required=true) - private String photo; - - /** - * 学历证明 - */ - @ApiModelProperty(value = "学历证明", required=true) - private String certificate; - - /** - * 健康体检报告 - */ - @ApiModelProperty(value = "健康体检报告", required=true) - private String physicalReport; - /** * 签名图片 */ diff --git a/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/request/ExamSearchDTO.java b/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/request/ExamSearchDTO.java index 3e7998d..fc4c9c1 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/request/ExamSearchDTO.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/exam/dto/request/ExamSearchDTO.java @@ -18,9 +18,9 @@ public class ExamSearchDTO { private Integer openType; /** - * 考试类型（1：模拟考试，2：正式考试） + * 考试类型（1：模拟考试，2：正式考试，3：补考） * */ - @ApiModelProperty(value = "考试类型（1：模拟考试，2：正式考试）", required=true) + @ApiModelProperty(value = "考试类型（1：模拟考试，2：正式考试，3：补考）", required=true) private Integer examType; /** diff --git a/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/Exam.java b/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/Exam.java index 6aea68e..845c70b 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/Exam.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/Exam.java @@ -48,7 +48,7 @@ public class Exam extends Model { private Integer openType; /** - * 考试类型（1：模拟考试，2：正式考试） + * 考试类型（1：模拟考试，2：正式考试，3：补考） * */ private Integer examType; diff --git a/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/ExamRegistration.java b/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/ExamRegistration.java index 23faa49..f38c342 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/ExamRegistration.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/ExamRegistration.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; import java.time.LocalDate; import java.util.Date; import lombok.Data; @@ -16,7 +15,7 @@ import lombok.Data; **/ @Data @TableName("el_exam_registration") -public class ExamRegistration extends Model { +public class ExamRegistration extends UserAttachment { private static final long serialVersionUID = 1L; @@ -61,81 +60,6 @@ public class ExamRegistration extends Model { */ private String title; - /** - * 电子邮箱 - */ - private String email; - - /** - * 通讯地址 - */ - private String address; - - /** - * 最高学历,1:初中,2:高中/中专,3:大专及以上 - */ - private Integer education; - - /** - * 毕业院校 - */ - private String graduateSchool; - - /** - * 专业 - */ - private String major; - - /** - * 报考类别（1：普通医疗护理员，2:老年医疗护理员，3：孕产妇和新生儿医疗护理员） - */ - private Integer regType; - - /** - * 培训机构 - */ - private String trainInstitution; - - /** - * 培训开始时间 - */ - private LocalDate trainStartDate; - - /** - * 培训结束时间 - */ - private LocalDate trainEndDate; - - /** - * 身份证正面照片 - */ - private String cardFront; - - /** - * 身份证背面照片 - */ - private String cardBack; - - /** - * 身份证正反面复印件 - */ - private String cardCopy; - - /** - * 证件照 - */ - private String photo; - - /** - * 学历证明 - */ - private String certificate; - - /** - * 健康体检报告 - */ - private String physicalReport; - /** * 签名图片 */ diff --git a/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/UserAttachment.java b/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/UserAttachment.java new file mode 100644 index 0000000..1335bfd --- /dev/null +++ b/exam-admin/src/main/java/com/yf/exam/modules/exam/entity/UserAttachment.java @@ -0,0 +1,104 @@ +package com.yf.exam.modules.exam.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDate; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * @description: 用户附件 + * @author: haown + * @create: 2025-07-16 14:04 + **/ +@Data +public class UserAttachment { + + /** + * 电子邮箱 + */ + @ApiModelProperty(value = "电子邮箱", required=true) + private String email; + + /** + * 通讯地址 + */ + @ApiModelProperty(value = "通讯地址", required=true) + private String address; + + /** + * 最高学历,1:初中,2:高中/中专,3:大专及以上 + */ + @ApiModelProperty(value = "最高学历,1:初中,2:高中/中专,3:大专及以上", required=true) + private Integer education; + + /** + * 毕业院校 + */ + @ApiModelProperty(value = "毕业院校", required=true) + private String graduateSchool; + + /** + * 专业 + */ + @ApiModelProperty(value = "专业", required=true) + private String major; + + /** + * 报考类别（1：普通医疗护理员，2:老年医疗护理员，3：孕产妇和新生儿医疗护理员） + */ + @ApiModelProperty(value = "报考类别（1：普通医疗护理员，2:老年医疗护理员，3：孕产妇和新生儿医疗护理员）", required=true) + private Integer regType; + + /** + * 培训机构 + */ + @ApiModelProperty(value = "培训机构") + private String trainInstitution; + + /** + * 培训开始时间 + */ + @ApiModelProperty(value = "培训开始时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate trainStartDate; + + /** + * 培训结束时间 + */ + @ApiModelProperty(value = "培训结束时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate trainEndDate; + + /** + * 身份证正面照片 + */ + private String cardFront; + + /** + * 身份证背面照片 + */ + private String cardBack; + + /** + * 身份证正反面复印件 + */ + private String cardCopy; + + /** + * 证件照 + */ + private String photo; + + /** + * 学历证明 + */ + private String certificate; + + /** + * 健康体检报告 + */ + private String physicalReport; +} diff --git a/exam-admin/src/main/java/com/yf/exam/modules/exam/service/impl/ExamServiceImpl.java b/exam-admin/src/main/java/com/yf/exam/modules/exam/service/impl/ExamServiceImpl.java index b982731..ac7853b 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/exam/service/impl/ExamServiceImpl.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/exam/service/impl/ExamServiceImpl.java @@ -19,7 +19,6 @@ import com.yf.exam.modules.exam.mapper.ExamMapper; import com.yf.exam.modules.exam.service.ExamDepartService; import com.yf.exam.modules.exam.service.ExamRepoService; import com.yf.exam.modules.exam.service.ExamService; -import com.yf.exam.modules.paper.enums.ExamType; import java.time.LocalDate; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -171,7 +170,6 @@ public class ExamServiceImpl extends ServiceImpl implements Ex */ @Override public List getExamList(ExamSearchDTO reqDTO) { - reqDTO.setExamType(ExamType.FORMAL); reqDTO.setStartDate(LocalDate.now()); reqDTO.setEndDate(LocalDate.now()); List list = baseMapper.getExamList(reqDTO); diff --git a/exam-admin/src/main/java/com/yf/exam/modules/paper/enums/ExamType.java b/exam-admin/src/main/java/com/yf/exam/modules/paper/enums/ExamType.java index 2938035..6189b06 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/paper/enums/ExamType.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/paper/enums/ExamType.java @@ -17,4 +17,6 @@ public interface ExamType { */ Integer FORMAL = 2; + Integer RESIT = 3; + } diff --git a/exam-admin/src/main/java/com/yf/exam/modules/paper/service/impl/PaperServiceImpl.java b/exam-admin/src/main/java/com/yf/exam/modules/paper/service/impl/PaperServiceImpl.java index d43c91c..5264955 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/paper/service/impl/PaperServiceImpl.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/paper/service/impl/PaperServiceImpl.java @@ -517,9 +517,9 @@ public class PaperServiceImpl extends ServiceImpl implements String name = JobPrefix.BREAK_EXAM + paperId; jobService.deleteJob(name, JobGroup.SYSTEM); - // 正式考试修改报名表，考试状态为已考试 + // 正式考试/补考 修改报名表，考试状态为已考试 ExamDTO examDTO = examService.findById(paper.getExamId()); - if (Objects.equals(examDTO.getExamType(), ExamType.FORMAL)) { + if (Objects.equals(examDTO.getExamType(), ExamType.FORMAL) || Objects.equals(examDTO.getExamType(), ExamType.RESIT)) { ExamRegistration examRegistration = new ExamRegistration(); examRegistration.setExamId(examDTO.getId()); examRegistration.setUserId(paper.getUserId()); diff --git a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/dto/SysUserDTO.java b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/dto/SysUserDTO.java index 0cf44b5..920983f 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/dto/SysUserDTO.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/dto/SysUserDTO.java @@ -1,5 +1,6 @@ package com.yf.exam.modules.sys.user.dto; +import com.yf.exam.modules.exam.entity.UserAttachment; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; @@ -16,7 +17,7 @@ import lombok.Data; */ @Data @ApiModel(value="管理用户", description="管理用户") -public class SysUserDTO implements Serializable { +public class SysUserDTO extends UserAttachment implements Serializable { private static final long serialVersionUID = 1L; diff --git a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/dto/response/SysUserLoginDTO.java b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/dto/response/SysUserLoginDTO.java index 320d820..78fb157 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/dto/response/SysUserLoginDTO.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/dto/response/SysUserLoginDTO.java @@ -1,5 +1,6 @@ package com.yf.exam.modules.sys.user.dto.response; +import com.yf.exam.modules.exam.entity.UserAttachment; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ import java.util.List; */ @Data @ApiModel(value="管理用户登录响应类", description="管理用户登录响应类") -public class SysUserLoginDTO implements Serializable { +public class SysUserLoginDTO extends UserAttachment implements Serializable { private static final long serialVersionUID = 1L; diff --git a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/entity/SysUser.java b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/entity/SysUser.java index 852fb0d..5a72abd 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/entity/SysUser.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/entity/SysUser.java @@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import lombok.Data; - +import com.yf.exam.modules.exam.entity.UserAttachment; import java.util.Date; +import lombok.Data; /** *

@@ -19,7 +18,7 @@ import java.util.Date; */ @Data @TableName("sys_user") -public class SysUser extends Model { +public class SysUser extends UserAttachment { private static final long serialVersionUID = 1L; diff --git a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/mapper/SysUserMapper.java b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/mapper/SysUserMapper.java index de7ae4f..cb00b5b 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/mapper/SysUserMapper.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/mapper/SysUserMapper.java @@ -1,7 +1,11 @@ package com.yf.exam.modules.sys.user.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yf.exam.modules.sys.user.dto.SysUserDTO; import com.yf.exam.modules.sys.user.entity.SysUser; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +17,6 @@ import com.yf.exam.modules.sys.user.entity.SysUser; */ public interface SysUserMapper extends BaseMapper { + IPage paging(Page page, @Param("query") SysUserDTO query); + } diff --git a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/service/impl/SysUserServiceImpl.java b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/service/impl/SysUserServiceImpl.java index 9c1e536..2627b2a 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/sys/user/service/impl/SysUserServiceImpl.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/sys/user/service/impl/SysUserServiceImpl.java @@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fasterxml.jackson.core.type.TypeReference; import com.yf.exam.ability.shiro.jwt.JwtUtils; import com.yf.exam.core.api.ApiError; import com.yf.exam.core.api.dto.PagingReqDTO; import com.yf.exam.core.enums.CommonState; import com.yf.exam.core.exception.ServiceException; import com.yf.exam.core.utils.BeanMapper; -import com.yf.exam.core.utils.jackson.JsonHelper; import com.yf.exam.core.utils.passwd.PassHandler; import com.yf.exam.core.utils.passwd.PassInfo; import com.yf.exam.modules.sys.user.dto.SysUserDTO; @@ -23,16 +21,16 @@ import com.yf.exam.modules.sys.user.mapper.SysUserMapper; import com.yf.exam.modules.sys.user.service.SysUserRoleService; import com.yf.exam.modules.sys.user.service.SysUserService; import com.yf.exam.modules.user.UserUtils; +import java.util.ArrayList; +import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.List; - /** *

* 语言设置 服务实现类 @@ -52,27 +50,33 @@ public class SysUserServiceImpl extends ServiceImpl impl public IPage paging(PagingReqDTO reqDTO) { //创建分页对象 - IPage query = new Page<>(reqDTO.getCurrent(), reqDTO.getSize()); + //IPage query = new Page<>(reqDTO.getCurrent(), reqDTO.getSize()); //查询条件 - QueryWrapper wrapper = new QueryWrapper<>(); + //QueryWrapper wrapper = new QueryWrapper<>(); - SysUserDTO params = reqDTO.getParams(); + //SysUserDTO params = reqDTO.getParams(); + // + //if(params!=null){ + // if(!StringUtils.isBlank(params.getUserName())){ + // wrapper.lambda().like(SysUser::getUserName, params.getUserName()); + // } + // + // if(!StringUtils.isBlank(params.getRealName())){ + // wrapper.lambda().like(SysUser::getRealName, params.getRealName()); + // } + //} + // + ////获得数据 + //IPage page = this.page(query, wrapper); + ////转换结果 + //IPage pageData = JsonHelper.parseObject(page, new TypeReference>(){}); - if(params!=null){ - if(!StringUtils.isBlank(params.getUserName())){ - wrapper.lambda().like(SysUser::getUserName, params.getUserName()); - } + // 创建分页对象 + Page page = new Page(reqDTO.getCurrent(), reqDTO.getSize()); + // 查找分页 + IPage pageData = baseMapper.paging(page, reqDTO.getParams()); - if(!StringUtils.isBlank(params.getRealName())){ - wrapper.lambda().like(SysUser::getRealName, params.getRealName()); - } - } - - //获得数据 - IPage page = this.page(query, wrapper); - //转换结果 - IPage pageData = JsonHelper.parseObject(page, new TypeReference>(){}); return pageData; } @@ -198,10 +202,12 @@ public class SysUserServiceImpl extends ServiceImpl impl // 保存用户 SysUser user = new SysUser(); + BeanUtils.copyProperties(reqDTO, user); user.setId(IdWorker.getIdStr()); - user.setUserName(reqDTO.getUserName()); - user.setRealName(reqDTO.getRealName()); - user.setPhone(reqDTO.getPhone()); + //user.setUserName(reqDTO.getUserName()); + //user.setRealName(reqDTO.getRealName()); + //user.setPhone(reqDTO.getPhone()); + PassInfo passInfo = PassHandler.buildPassword(reqDTO.getPassword()); user.setPassword(passInfo.getPassword()); user.setSalt(passInfo.getSalt()); @@ -239,7 +245,9 @@ public class SysUserServiceImpl extends ServiceImpl impl private SysUserLoginDTO setToken(SysUser user){ SysUserLoginDTO respDTO = new SysUserLoginDTO(); - BeanMapper.copy(user, respDTO); + + BeanUtils.copyProperties(user, respDTO); + //BeanMapper.copy(user, respDTO); // 生成Token String token = JwtUtils.sign(user.getUserName()); diff --git a/exam-admin/src/main/java/com/yf/exam/modules/user/exam/dto/request/UserExamReqDTO.java b/exam-admin/src/main/java/com/yf/exam/modules/user/exam/dto/request/UserExamReqDTO.java index 29f4bfd..2ceeb64 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/user/exam/dto/request/UserExamReqDTO.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/user/exam/dto/request/UserExamReqDTO.java @@ -27,9 +27,9 @@ public class UserExamReqDTO extends UserExamDTO { private String realName; /** - * 考试类型（1：模拟考试，2：正式考试） + * 考试类型（1：模拟考试，2：正式考试，3：补考） * */ - @ApiModelProperty(value = "考试类型（1：模拟考试，2：正式考试）", required=true) + @ApiModelProperty(value = "考试类型（1：模拟考试，2：正式考试，3：补考）", required=true) private Integer examType; diff --git a/exam-admin/src/main/java/com/yf/exam/modules/user/exam/dto/response/UserExamRespDTO.java b/exam-admin/src/main/java/com/yf/exam/modules/user/exam/dto/response/UserExamRespDTO.java index 251576c..ddc428f 100644 --- a/exam-admin/src/main/java/com/yf/exam/modules/user/exam/dto/response/UserExamRespDTO.java +++ b/exam-admin/src/main/java/com/yf/exam/modules/user/exam/dto/response/UserExamRespDTO.java @@ -24,9 +24,9 @@ public class UserExamRespDTO extends UserExamDTO { private String title; /** - * 考试类型（1：模拟考试，2：正式考试） + * 考试类型（1：模拟考试，2：正式考试，3：补考） * */ - @ApiModelProperty(value = "考试类型（1：模拟考试，2：正式考试）", required=true) + @ApiModelProperty(value = "考试类型（1：模拟考试，2：正式考试，3：补考）", required=true) private Integer examType; @ApiModelProperty(value = "人员名称", required=true) diff --git a/exam-admin/src/main/resources/mapper/exam/ExamMapper.xml b/exam-admin/src/main/resources/mapper/exam/ExamMapper.xml index d019040..288e3d7 100644 --- a/exam-admin/src/main/resources/mapper/exam/ExamMapper.xml +++ b/exam-admin/src/main/resources/mapper/exam/ExamMapper.xml @@ -102,7 +102,7 @@ + SELECT * + FROM sys_user + + + + AND user_name LIKE CONCAT('%',#{query.userName},'%') + + + AND real_name LIKE CONCAT('%',#{query.realName},'%') + + + +