修改代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -93,12 +93,14 @@ public class WaterResourceDto extends BaseDto {
 	@ApiModelProperty(value = "建造日期")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
+	@com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd")
 	private Date buildDate;
 
 	@ExcelProperty(value = "启用日期", index = 8)
 	@ApiModelProperty(value = "启用日期")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
+	@com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd")
 	private Date enableDate;
 
 	@ExcelIgnore

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelSingleTemplateDto.java

@@ -2,8 +2,11 @@ package com.yeejoin.equipmanage.dto;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.equipmanage.utils.ExplicitConstraint;
 import com.yeejoin.equipmanage.utils.RoleNameExplicitConstraint;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -60,6 +63,9 @@ public class EquipmentDetailExcelSingleTemplateDto {
     private String companyName;
 
     @ExcelProperty(value = "生产日期", index = 11)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd")
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date productionDate;
 
@@ -72,6 +78,9 @@ public class EquipmentDetailExcelSingleTemplateDto {
 //    private BigDecimal maintenanceCycle ;
 
     @ExcelProperty(value = "投运日期", index = 12)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd")
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date deliveryDate;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelTemplateDto.java

 package com.yeejoin.equipmanage.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.equipmanage.utils.ExplicitConstraint;
 import com.yeejoin.equipmanage.utils.RoleNameExplicitConstraint;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -65,6 +67,9 @@ public class EquipmentDetailExcelTemplateDto implements Serializable {
     private String companyName;
 
     @ExcelProperty(value = "生产日期", index = 12)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd")
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date productionDate;
 
@@ -77,6 +82,9 @@ public class EquipmentDetailExcelTemplateDto implements Serializable {
 //    private BigDecimal maintenanceCycle ;
 
     @ExcelProperty(value = "投运时间", index = 13)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd")
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date deliveryDate;