From 2198ebdeaa6a7f19269b48ba4908e6269427bcfb Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 28 Aug 2026 10:45:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=8F=AD=E7=BA=A7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/qinan/cedu/model/dto/ClassManagementDTO.java | 8 ++++---- .../qinan/cedu/model/query/ClassManagementPageQuery.java | 6 ++++++ .../org/qinan/cedu/model/query/ClassStudentPageQuery.java | 6 ++++++ .../change/request/QualFilingCommitmentChangeAddCmd.java | 4 ++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java index 62a5c974..8a686d66 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java @@ -1,10 +1,8 @@ package org.qinan.cedu.model.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.qinan.cedu.config.FlexibleLocalDateTimeDeserializer; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -46,11 +44,13 @@ public class ClassManagementDTO { private String safetyManager; @ApiModelProperty("培训开始日期") - @JsonDeserialize(using = FlexibleLocalDateTimeDeserializer.class) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDate; @ApiModelProperty("培训结束日期") - @JsonDeserialize(using = FlexibleLocalDateTimeDeserializer.class) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endDate; @ApiModelProperty("是否开启考试（0-否，1-是）") diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/query/ClassManagementPageQuery.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/query/ClassManagementPageQuery.java index 00f13314..bfd37a8e 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/query/ClassManagementPageQuery.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/query/ClassManagementPageQuery.java @@ -1,8 +1,10 @@ package org.qinan.cedu.model.query; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -26,8 +28,12 @@ public class ClassManagementPageQuery extends BasePageQuery { private Integer status; @ApiModelProperty("培训开始时间起") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDateBegin; @ApiModelProperty("培训结束时间止") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endDateEnd; } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/query/ClassStudentPageQuery.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/query/ClassStudentPageQuery.java index bbe30320..c23782dd 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/query/ClassStudentPageQuery.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/query/ClassStudentPageQuery.java @@ -1,8 +1,10 @@ package org.qinan.cedu.model.query; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -32,8 +34,12 @@ public class ClassStudentPageQuery extends BasePageQuery { private String unitName; @ApiModelProperty("入班时间起（学员创建时间）") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime entryTimeStart; @ApiModelProperty("入班时间止（学员创建时间）") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime entryTimeEnd; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java index 3b2e93e0..6560d49a 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java @@ -1,7 +1,9 @@ package org.qinan.safetyeval.client.change.request; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -40,6 +42,8 @@ public class QualFilingCommitmentChangeAddCmd implements Serializable { * 签署日期 */ @ApiModelProperty(value = "签署日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime signDate; /** * 法定代表人机构人员id