diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExportExcel.java index bf0102a..40d22ab 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExportExcel.java @@ -37,7 +37,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Date; /** * 事故记录导出 Excel @@ -83,14 +83,14 @@ public class AccidentRecordExportExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExportExcel.java index a87ac07..3b9a297 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExportExcel.java @@ -36,7 +36,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Date; /** * 年检记录导出 Excel @@ -83,14 +83,14 @@ public class AnnualInspectionRecordExportExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExcel.java index 420cdca..bcc700d 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExcel.java @@ -24,6 +24,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -32,7 +33,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.time.LocalDateTime; +import java.util.Date; /** * 常用地址 Excel @@ -88,9 +89,11 @@ public class CommonAddressExcel implements Serializable { private String remark; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java index b9bf5e6..de8be2b 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java @@ -24,6 +24,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.format.NumberFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; @@ -33,7 +34,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.time.LocalDateTime; +import java.util.Date; /** * 常用货物导出 Excel @@ -96,9 +97,11 @@ public class CommonCargoExportExcel implements Serializable { private String deptName; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExcel.java index 31b2b76..34fb45e 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExcel.java @@ -23,6 +23,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -30,7 +31,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * 常用线路 Excel @@ -75,8 +76,10 @@ public class CommonRouteExcel implements Serializable { @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java index 853fa58..39aba2a 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java @@ -23,6 +23,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -31,7 +32,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Date; /** * 合同管理 Excel @@ -88,8 +89,10 @@ public class ContractManageExcel implements Serializable { @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EtcRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EtcRecordExportExcel.java index 0283274..1400ed0 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EtcRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EtcRecordExportExcel.java @@ -11,6 +11,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Date; /** * ETC记录导出 Excel @@ -50,14 +51,14 @@ public class EtcRecordExportExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExportExcel.java index 77702c1..ad1f0e7 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExportExcel.java @@ -36,7 +36,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Date; /** * 保险记录导出 Excel @@ -83,14 +83,14 @@ public class InsuranceRecordExportExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/LoadingManageExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/LoadingManageExcel.java index 5687407..7995345 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/LoadingManageExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/LoadingManageExcel.java @@ -6,6 +6,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -13,7 +14,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * 配载管理 Excel @@ -54,9 +55,11 @@ public class LoadingManageExcel implements Serializable { @ExcelProperty("数据来源") private String dataSource; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; @ExcelProperty("过程节点") private String currentProcessNode; @ExcelProperty("状态") diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExportExcel.java index 4d6666f..a3c8a84 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExportExcel.java @@ -11,7 +11,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; -import java.time.LocalDateTime; +import java.util.Date; /** * 车辆保养记录导出 Excel @@ -26,12 +26,12 @@ public class MaintenancePlanExportExcel extends MaintenancePlanExcel { @ExcelProperty(value = "创建时间", index = 12) @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty(value = "更新人", index = 13) private String updateUserName; @ExcelProperty(value = "更新时间", index = 14) @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java index 6361d71..854a537 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java @@ -38,6 +38,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Date; /** * 车辆维修记录 Excel @@ -97,14 +98,14 @@ public class MaintenanceRecordExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("里程单位") private String mileageUnit; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExportExcel.java index be5b248..55be035 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExportExcel.java @@ -36,7 +36,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.time.LocalDateTime; +import java.util.Date; /** * 里程记录导出 Excel @@ -75,14 +75,14 @@ public class MileageRecordExportExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OilElectricRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OilElectricRecordExportExcel.java index e844b9c..3db7279 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OilElectricRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OilElectricRecordExportExcel.java @@ -11,6 +11,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Date; /** * 油电记录导出 Excel @@ -61,14 +62,14 @@ public class OilElectricRecordExportExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExportExcel.java index cbf4b79..1dfe171 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExportExcel.java @@ -11,7 +11,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Date; /** * 其他费用记录导出 Excel @@ -43,14 +43,14 @@ public class OtherExpenseRecordExportExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExcel.java index cd565dc..efc663a 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExcel.java @@ -23,6 +23,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -30,7 +31,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * 过程配置 Excel @@ -69,8 +70,10 @@ public class ProcessConfigExcel implements Serializable { @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProjectApplyExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProjectApplyExcel.java index 25238f7..2229dcb 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProjectApplyExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProjectApplyExcel.java @@ -23,6 +23,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -33,6 +34,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Date; /** * 项目立项 Excel @@ -119,8 +121,10 @@ public class ProjectApplyExcel implements Serializable { @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ShippingTemplateExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ShippingTemplateExcel.java index 2731bbe..6457383 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ShippingTemplateExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ShippingTemplateExcel.java @@ -23,6 +23,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -30,7 +31,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * 发货模板 Excel @@ -59,8 +60,10 @@ public class ShippingTemplateExcel implements Serializable { @ExcelProperty("备注") private String remark; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TemporaryCreditLimitExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TemporaryCreditLimitExcel.java index 03ceb9b..5d58a54 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TemporaryCreditLimitExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TemporaryCreditLimitExcel.java @@ -23,6 +23,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -32,7 +33,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Date; /** * 临时额度申请 Excel @@ -81,8 +82,10 @@ public class TemporaryCreditLimitExcel implements Serializable { @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExportExcel.java index e2e2a32..26009e8 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExportExcel.java @@ -37,7 +37,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Date; /** * 换胎记录导出 Excel @@ -76,14 +76,14 @@ public class TireReplacementRecordExportExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportChangeRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportChangeRecordExportExcel.java index d4f4ce9..f737cd2 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportChangeRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportChangeRecordExportExcel.java @@ -28,7 +28,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * 变更记录导出 Excel @@ -57,14 +57,14 @@ public class TransportChangeRecordExportExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportPlanExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportPlanExcel.java index 955d0b0..c5d4e7e 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportPlanExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportPlanExcel.java @@ -23,6 +23,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -31,7 +32,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Date; /** * 运输计划 Excel @@ -92,8 +93,10 @@ public class TransportPlanExcel implements Serializable { @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordExcel.java index 7abf349..7b95877 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordExcel.java @@ -37,6 +37,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Date; /** * 违章记录 Excel @@ -95,14 +96,14 @@ public class ViolationRecordExcel implements Serializable { @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; @ExcelIgnore private String errorMessage; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/WaybillExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/WaybillExcel.java index 3a68f3e..09e60ef 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/WaybillExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/WaybillExcel.java @@ -23,6 +23,7 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; @@ -33,7 +34,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Date; import java.time.LocalDate; /** @@ -151,9 +152,11 @@ public class WaybillExcel implements Serializable { @ExcelProperty("更新人") private String updateUserName; @ExcelProperty("创建时间") - private LocalDateTime createTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date updateTime; @ExcelIgnore private String errorMessage; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java index 934c257..56ad900 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java @@ -150,6 +150,8 @@ public class WaybillServiceImpl extends BaseServiceImpl try { Waybill waybill = Objects.requireNonNull(BeanUtil.copyProperties(excel, Waybill.class)); waybill.setDataSource("批量导入"); + waybill.setCreateTime(null); + waybill.setUpdateTime(null); waybill.setCarrierJson(buildImportCarrierJson(waybill)); submit(waybill); } catch (Exception exception) {