From cc98f525cbc17d4acdc095b50d382dbaf95c0b68 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期四, 28 九月 2023 10:50:09 +0800
Subject: [PATCH] bug修复
---
exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetExaminerRespDTO.java | 11 +++--
exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddOperateTypeReqDTO.java | 4 --
exam-system/src/main/java/com/gkhy/exam/coalmine/entity/ExaminerManage.java | 3 +
exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageUpdateReqDTO.java | 5 +-
exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java | 5 +-
exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddOperateTypeReqDTO.java | 4 --
exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageUpdateReqDTO.java | 5 +-
exam-system/src/main/java/com/gkhy/exam/coalmine/entity/TeacherManage.java | 26 ++++++++----
exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java | 12 ++++--
exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddReqDTO.java | 5 +-
exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java | 5 +-
exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddReqDTO.java | 5 +-
exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetTeacherRespDTO.java | 11 +++--
13 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java
index ce55cf1..8133535 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java
@@ -20,6 +20,7 @@
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -87,7 +88,7 @@
@ApiImplicitParam(name = "qaAttachment", dataTypeClass = Long.class,value = "资质照id"),
@ApiImplicitParam(name = "jobTitle", dataTypeClass = String.class,value = "职称"),
@ApiImplicitParam(name = "eduLevel", dataTypeClass = String.class,value = "最高学历",required = true),
- @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDateTime.class,value = "过期时间",required = true),
+ @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDate.class,value = "过期时间",required = true),
@ApiImplicitParam(name = "isCm", dataTypeClass = Byte.class,value = "是否为煤矿：0为非，1是",required = true),
@ApiImplicitParam(name = "status", dataTypeClass = String.class,value = "状态不能为空:0-正常，1-停用",required = true),
@ApiImplicitParam(name = "description", dataTypeClass = String.class,value = "描述"),
@@ -111,7 +112,7 @@
@ApiImplicitParam(name = "qaAttachment", dataTypeClass = Long.class,value = "资质照id"),
@ApiImplicitParam(name = "jobTitle", dataTypeClass = String.class,value = "职称"),
@ApiImplicitParam(name = "eduLevel", dataTypeClass = String.class,value = "最高学历",required = true),
- @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDateTime.class,value = "过期时间",required = true),
+ @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDate.class,value = "过期时间",required = true),
@ApiImplicitParam(name = "isCm", dataTypeClass = Byte.class,value = "是否为煤矿：0为非，1是",required = true),
@ApiImplicitParam(name = "status", dataTypeClass = String.class,value = "状态不能为空:0-正常，1-停用",required = true),
@ApiImplicitParam(name = "description", dataTypeClass = String.class,value = "描述"),
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java
index a1bc7bf..25c3734 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java
@@ -24,6 +24,7 @@
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -91,7 +92,7 @@
@ApiImplicitParam(name = "qaAttachment", dataTypeClass = Long.class,value = "资质照id"),
@ApiImplicitParam(name = "jobTitle", dataTypeClass = String.class,value = "职称"),
@ApiImplicitParam(name = "eduLevel", dataTypeClass = String.class,value = "最高学历",required = true),
- @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDateTime.class,value = "过期时间",required = true),
+ @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDate.class,value = "过期时间",required = true),
@ApiImplicitParam(name = "isCm", dataTypeClass = Byte.class,value = "是否为煤矿：0为非，1是",required = true),
@ApiImplicitParam(name = "status", dataTypeClass = String.class,value = "状态不能为空:0-正常，1-停用",required = true),
@ApiImplicitParam(name = "description", dataTypeClass = String.class,value = "描述"),
@@ -115,7 +116,7 @@
@ApiImplicitParam(name = "qaAttachment", dataTypeClass = Long.class,value = "资质照id"),
@ApiImplicitParam(name = "jobTitle", dataTypeClass = String.class,value = "职称"),
@ApiImplicitParam(name = "eduLevel", dataTypeClass = String.class,value = "最高学历",required = true),
- @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDateTime.class,value = "过期时间",required = true),
+ @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDate.class,value = "过期时间",required = true),
@ApiImplicitParam(name = "isCm", dataTypeClass = Byte.class,value = "是否为煤矿：0为非，1是",required = true),
@ApiImplicitParam(name = "status", dataTypeClass = String.class,value = "状态不能为空:0-正常，1-停用",required = true),
@ApiImplicitParam(name = "description", dataTypeClass = String.class,value = "描述"),
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/entity/ExaminerManage.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/entity/ExaminerManage.java
index d41dc8b..1a5600f 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/entity/ExaminerManage.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/entity/ExaminerManage.java
@@ -1,5 +1,6 @@
package com.gkhy.exam.coalmine.entity;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
@@ -38,7 +39,7 @@
private String eduLevel;
//过期时间
- private LocalDateTime expiredTime;
+ private LocalDate expiredTime;
//是否为煤矿：0为非，1是
private Byte isCm;
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/entity/TeacherManage.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/entity/TeacherManage.java
index 3fb79ed..9562065 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/entity/TeacherManage.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/entity/TeacherManage.java
@@ -1,13 +1,15 @@
package com.gkhy.exam.coalmine.entity;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.data.annotation.Id;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
@Data
@TableName("teacher_manage")
@@ -36,10 +38,10 @@
private String eduLevel;
//过期时间
- private LocalDateTime expiredTime;
+ private LocalDate expiredTime;
//是否为煤矿：0为非，1是
- private Integer isCm;
+ private Byte isCm;
//描述
private String description;
@@ -54,16 +56,22 @@
//删除标志（0代表存在 2代表删除）
private Byte delFlag;
- //创建者
+ /** 创建者 */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
- //创建时间
+ /** 创建时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- //更新者
+ /** 更新者 */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
- //更新时间
+ /** 更新时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
}
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddOperateTypeReqDTO.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddOperateTypeReqDTO.java
index acd0517..6798c23 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddOperateTypeReqDTO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddOperateTypeReqDTO.java
@@ -17,19 +17,15 @@
public class ExaminerManageAddOperateTypeReqDTO implements Serializable {
//操作类型
- @NotNull(message = "操作类型id不能为空")
private Long operateTypeId;
//资格类型
- @NotBlank(message = "资格类型不能为空")
private String qualificationType;
//作业类别
- @NotBlank(message = "作业类别不能为空")
private String jobCategory;
//操作项目
- @NotBlank(message = "操作项目不能为空")
private String operationItems;
}
\ No newline at end of file
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddReqDTO.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddReqDTO.java
index e32dc94..75e8921 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddReqDTO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageAddReqDTO.java
@@ -8,6 +8,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -47,8 +48,8 @@
//过期时间
@NotNull(message = "过期时间不能为空")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime expiredTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate expiredTime;
//是否为煤矿：0为非，1是
@NotNull(message = "煤矿类型不能为空")
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageUpdateReqDTO.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageUpdateReqDTO.java
index 73b7c07..a185505 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageUpdateReqDTO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/ExaminerManageUpdateReqDTO.java
@@ -7,6 +7,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -49,8 +50,8 @@
//过期时间
@NotNull(message = "过期时间不能为空")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime expiredTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate expiredTime;
//是否为煤矿：0为非，1是
@NotNull(message = "煤矿类型不能为空")
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddOperateTypeReqDTO.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddOperateTypeReqDTO.java
index bf2c51d..5b340af 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddOperateTypeReqDTO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddOperateTypeReqDTO.java
@@ -15,19 +15,15 @@
public class TeacherManageAddOperateTypeReqDTO implements Serializable {
//操作类型
- @NotNull(message = "操作类型id不能为空")
private Long operateTypeId;
//资格类型
- @NotBlank(message = "资格类型不能为空")
private String qualificationType;
//作业类别
- @NotBlank(message = "作业类别不能为空")
private String jobCategory;
//操作项目
- @NotBlank(message = "操作项目不能为空")
private String operationItems;
}
\ No newline at end of file
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddReqDTO.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddReqDTO.java
index bd2a011..eea90b4 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddReqDTO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageAddReqDTO.java
@@ -7,6 +7,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -46,8 +47,8 @@
//过期时间
@NotNull(message = "过期时间不能为空")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime expiredTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate expiredTime;
//是否为煤矿：0为非，1是
@NotNull(message = "煤矿类型不能为空")
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageUpdateReqDTO.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageUpdateReqDTO.java
index 3cf9d24..c0ca2fa 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageUpdateReqDTO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/req/TeacherManageUpdateReqDTO.java
@@ -7,6 +7,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -49,8 +50,8 @@
//过期时间
@NotNull(message = "过期时间不能为空")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime expiredTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate expiredTime;
//是否为煤矿：0为非，1是
@NotNull(message = "煤矿类型不能为空")
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetExaminerRespDTO.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetExaminerRespDTO.java
index 023ea0e..5fcf2d6 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetExaminerRespDTO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetExaminerRespDTO.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -21,7 +22,7 @@
private String name;
//性别
- private Integer sex;
+ private String sex;
//身份证
private String code;
@@ -30,13 +31,13 @@
private String mobilePhone;
//职称
- private Long jobTitle;
+ private String jobTitle;
//最高学历
- private Long eduLevel;
+ private String eduLevel;
//过期时间
- private LocalDateTime expiredTime;
+ private LocalDate expiredTime;
//是否为煤矿：0为非，1是
private Byte isCm;
@@ -51,6 +52,6 @@
private List<GetExaminerOperateTypesRespDTO> operateTypes;
//状态
- private Byte status;
+ private String status;
}
\ No newline at end of file
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetTeacherRespDTO.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetTeacherRespDTO.java
index 75304f4..ca34d6f 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetTeacherRespDTO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/model/dto/resp/GetTeacherRespDTO.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -21,7 +22,7 @@
private String name;
//性别
- private Integer sex;
+ private String sex;
//身份证
private String code;
@@ -30,13 +31,13 @@
private String mobilePhone;
//职称
- private Long jobTitle;
+ private String jobTitle;
//最高学历
- private Long eduLevel;
+ private String eduLevel;
//过期时间
- private LocalDateTime expiredTime;
+ private LocalDate expiredTime;
//是否为煤矿：0为非，1是
private Byte isCm;
@@ -51,6 +52,6 @@
private List<GetTeacherOperateTypesRespDTO> operateTypes;
//状态
- private Byte status;
+ private String status;
}
\ No newline at end of file
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java
index 56459e9..aaf7c6a 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java
@@ -1,5 +1,7 @@
package com.gkhy.exam.coalmine.service.impl;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.gkhy.exam.coalmine.entity.ExaminerManage;
import com.gkhy.exam.coalmine.entity.ExaminerManageOperateTypeBind;
@@ -143,7 +145,7 @@
ExaminerManage examinerByCode = examinerManageService.getExaminerByCode(reqDTO.getCode());
if (examinerByCode != null && examinerByCode.getId() != reqDTO.getId())
throw new BusinessException(this.getClass(),ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"身份证已存在");
- ExaminerManage examinerManage = new ExaminerManage();
+ ExaminerManage examinerManage = examinerManageService.getExaminerById(reqDTO.getId());
BeanUtils.copyProperties(reqDTO,examinerManage,"id");
boolean save = examinerManageService.updateById(examinerManage);
if (!save)
@@ -198,7 +200,8 @@
if (flag){
operateTypeService.resetOperateTypeCache();
}
- map = redisCache.getCacheObject(CacheConstants.SYS_OPERATE_TYPE_NAME_KEY);
+ String info = redisCache.getCacheObject(CacheConstants.SYS_OPERATE_TYPE_NAME_KEY);
+ map = JSON.parseObject(info, new TypeReference<Map<Long, SysOperateTypeWholeNameBO>>() {});
List<GetExaminerOperateTypesRespDTO> getExaminerOperateTypesRespDTOS = new ArrayList<>();
for (ExaminerManageOperateTypeBind examinerManageOperateTypeBind : list) {
GetExaminerOperateTypesRespDTO operateTypesRespDTO = new GetExaminerOperateTypesRespDTO();
@@ -265,7 +268,7 @@
TeacherManage teacherByCode = teacherManageService.getTeacherByCode(reqDTO.getCode());
if (teacherByCode != null && teacherByCode.getId() != reqDTO.getId())
throw new BusinessException(this.getClass(),ResultConstants.SYSTEM_ERROR_DATABASE_FAIL,"身份证已存在");
- TeacherManage teacherManage = new TeacherManage();
+ TeacherManage teacherManage = teacherManageService.getTeacherById(reqDTO.getId());
BeanUtils.copyProperties(reqDTO,teacherManage,"id");
boolean save = teacherManageService.updateById(teacherManage);
if (!save)
@@ -325,7 +328,8 @@
if (flag){
operateTypeService.resetOperateTypeCache();
}
- map = redisCache.getCacheObject(CacheConstants.SYS_OPERATE_TYPE_NAME_KEY);
+ String info = redisCache.getCacheObject(CacheConstants.SYS_OPERATE_TYPE_NAME_KEY);
+ map = JSON.parseObject(info, new TypeReference<Map<Long, SysOperateTypeWholeNameBO>>() {});
List<GetTeacherOperateTypesRespDTO> getTeacherOperateTypesRespDTOS = new ArrayList<>();
for (TeacherManageOperateTypeBind examinerManageOperateTypeBind : list) {
GetTeacherOperateTypesRespDTO operateTypesRespDTO = new GetTeacherOperateTypesRespDTO();
--
Gitblit v1.9.2