修改导出

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.format.NumberFormat;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
@@ -92,6 +94,7 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "启用日期", index = 8)
 	@ApiModelProperty(value = "启用日期")
+	@DateTimeFormat("yyyy-MM-dd")
 	private Date enableDate;
 
 	@ExcelIgnore
@@ -152,6 +155,7 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "高度（cm）", index = 11)
 	@ApiModelProperty(value = "高度（cm）")
+	@NumberFormat("#.##")
 	private float height;
 
 	@ExcelIgnore
@@ -182,14 +186,17 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "管网直径（cm）", index = 16)
 	@ApiModelProperty(value = "管网直径（cm）")
+	@NumberFormat("#.##")
 	private float pipeDiameter;
 
 	@ExcelProperty(value = "进水管直径(cm)", index = 17)
 	@ApiModelProperty(value = "进水管直径(cm)")
+	@NumberFormat("#.##")
 	private float inletPipeDiameter;
 
 	@ExcelProperty(value = "出水管直径(cm)", index = 18)
 	@ApiModelProperty(value = "出水管直径(cm)")
+	@NumberFormat("#.##")
 	private float outletPipeDiameter;
 
 	@ExcelProperty(value = "加水车道数量(个)", index = 19)
@@ -255,10 +262,12 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "容积（m³）", index = 28)
 	@ApiModelProperty(value = "容积（m³）")
+	@NumberFormat("#.##")
 	private float volume;
 
 	@ExcelProperty(value = "面积（㎡）", index = 29)
 	@ApiModelProperty(value = "面积（㎡）")
+	@NumberFormat("#.##")
 	private float area;
 
 	@ExcelProperty(value = "水质情况", index = 30)
@@ -286,10 +295,12 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "取水高度(cm)", index = 34)
 	@ApiModelProperty(value = "取水高度(cm)")
+	@NumberFormat("#.##")
 	private float intakeHeight;
 
 	@ExcelProperty(value = "水源标高差(cm)", index = 35)
 	@ApiModelProperty(value = "水源标高差(cm)")
+	@NumberFormat("#.##")
 	private float elevationDifference;
 
 	@ExcelProperty(value = "停车位置", index = 36)
@@ -374,10 +385,12 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "最低报警水位（m）", index = 43)
 	@ApiModelProperty(value = "最低报警水位（m）")
+	@NumberFormat("#.##")
 	private float minWaterLevel;
 
 	@ExcelProperty(value = "最高报警水位（m）", index = 44)
 	@ApiModelProperty(value = "最高报警水位（m）")
+	@NumberFormat("#.##")
 	private float maxWaterLevel;
 
 	@ExcelIgnore