diff --git a/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java b/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java index 4b29715..877d68e 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java @@ -8,6 +8,7 @@ import lombok.Getter; import lombok.Setter; import java.time.LocalDateTime; +import java.util.Date; /** * 抽检规则 @@ -56,11 +57,11 @@ public class Sampling { //开始时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @TableField("start_time") - private LocalDateTime startTime; + private Date startTime; //结束时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @TableField("end_time") - private LocalDateTime endTime; + private Date endTime; //被抽检次数 @TableField("sampling_number") private int samplingNumber; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java b/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java index 85c6297..f5b0dbf 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java @@ -32,7 +32,7 @@ public class SamplingPolice { @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @TableField("crt_time") private LocalDateTime crtTime; - + //身份证 @TableField("id_code") private String idCode; } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java b/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java index 9b408be..2e9d517 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java @@ -7,8 +7,8 @@ import lombok.Getter; import lombok.Setter; import org.springframework.format.annotation.DateTimeFormat; -import java.sql.Date; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; @Data @@ -45,9 +45,9 @@ public class SamplingVo { //辅警比例 private int assistRatio; //时间范围 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private List samplingTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private List samplingTime; //时间范围 //开始时间