diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalyses.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalyses.java index 04aca828..93dd0ebd 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalyses.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalyses.java @@ -33,7 +33,7 @@ public class GardsAnalyses implements Serializable { @TableField(value = "ANALYSISBEGIN") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate analysisBegin; + private Date analysisBegin; /** * 分析结束时间 @@ -41,7 +41,7 @@ public class GardsAnalyses implements Serializable { @TableField(value = "ANALYSISEND") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate analysisEnd; + private Date analysisEnd; /** * Reviewed:交互; @@ -145,7 +145,7 @@ public class GardsAnalyses implements Serializable { @TableField(value = "MODDATE") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime moddate; + private Date moddate; @TableField(value = "USEDGASPHD") private String usedGasPhd; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleAux.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleAux.java index d9a5a413..a97edcd5 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleAux.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleAux.java @@ -62,7 +62,7 @@ public class GardsSampleAux implements Serializable { @TableField(value = "CALIBRATION_DTG") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate calibrationDtg; + private Date calibrationDtg; /** * 报文ID号 diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCert.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCert.java index e0eeb4e1..5859b4a7 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCert.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCert.java @@ -7,7 +7,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.time.LocalDate; import java.util.Date; @Data @@ -32,7 +31,7 @@ public class GardsSampleCert implements Serializable { @TableField(value = "ASSAY_DATE") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate assayDate; + private Date assayDate; /** * 单位 diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java index 904176c4..e022036b 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java @@ -48,12 +48,12 @@ public class GardsDetectors implements Serializable { @TableField(value = "DATE_BEGIN") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime dateBegin; + private Date dateBegin; @TableField(value = "DATE_END") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime dateEnd; + private Date dateEnd; @TableField(value = "STATUS") private String status; @@ -63,7 +63,7 @@ public class GardsDetectors implements Serializable { @TableField(value = "MODDATE") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime moddate; + private Date moddate; @TableField(value = "STATION_ID") private Integer stationId; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsStations.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsStations.java index 6724c8fc..cebc87bc 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsStations.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsStations.java @@ -42,18 +42,18 @@ public class GardsStations implements Serializable { @TableField(value = "DATE_BEGIN") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate dateBegin; + private Date dateBegin; @TableField(value = "DATE_END") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate dateEnd; + private Date dateEnd; @TableField(value = "STATUS") private String status; @TableField(value = "MODDATE") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime moddate; + private Date moddate; }