fix: 班级bug

dev-tmp1
zhanglei 2026-08-28 10:45:42 +08:00
parent e05ff85fdd
commit 2198ebdeaa
4 changed files with 20 additions and 4 deletions

View File

@ -1,10 +1,8 @@
package org.qinan.cedu.model.dto; package org.qinan.cedu.model.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.qinan.cedu.config.FlexibleLocalDateTimeDeserializer;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -46,11 +44,13 @@ public class ClassManagementDTO {
private String safetyManager; private String safetyManager;
@ApiModelProperty("培训开始日期") @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; private LocalDateTime startDate;
@ApiModelProperty("培训结束日期") @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; private LocalDateTime endDate;
@ApiModelProperty("是否开启考试0-否1-是)") @ApiModelProperty("是否开启考试0-否1-是)")

View File

@ -1,8 +1,10 @@
package org.qinan.cedu.model.query; package org.qinan.cedu.model.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -26,8 +28,12 @@ public class ClassManagementPageQuery extends BasePageQuery {
private Integer status; private Integer status;
@ApiModelProperty("培训开始时间起") @ApiModelProperty("培训开始时间起")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startDateBegin; private LocalDateTime startDateBegin;
@ApiModelProperty("培训结束时间止") @ApiModelProperty("培训结束时间止")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endDateEnd; private LocalDateTime endDateEnd;
} }

View File

@ -1,8 +1,10 @@
package org.qinan.cedu.model.query; package org.qinan.cedu.model.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -32,8 +34,12 @@ public class ClassStudentPageQuery extends BasePageQuery {
private String unitName; private String unitName;
@ApiModelProperty("入班时间起(学员创建时间)") @ApiModelProperty("入班时间起(学员创建时间)")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime entryTimeStart; private LocalDateTime entryTimeStart;
@ApiModelProperty("入班时间止(学员创建时间)") @ApiModelProperty("入班时间止(学员创建时间)")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime entryTimeEnd; private LocalDateTime entryTimeEnd;
} }

View File

@ -1,7 +1,9 @@
package org.qinan.safetyeval.client.change.request; package org.qinan.safetyeval.client.change.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
@ -40,6 +42,8 @@ public class QualFilingCommitmentChangeAddCmd implements Serializable {
* *
*/ */
@ApiModelProperty(value = "签署日期") @ApiModelProperty(value = "签署日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime signDate; private LocalDateTime signDate;
/** /**
* id * id