Commit 3aa2c524 authored by lisong's avatar lisong

修改水源导出精度bug

parent 71a17ec3
...@@ -154,7 +154,7 @@ public class WaterResourceForExportDto extends BaseDto { ...@@ -154,7 +154,7 @@ public class WaterResourceForExportDto extends BaseDto {
@ExcelProperty(value = "高度(cm)", index = 11) @ExcelProperty(value = "高度(cm)", index = 11)
@ApiModelProperty(value = "高度(cm)") @ApiModelProperty(value = "高度(cm)")
private Float height; private Double height;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "水源可用状态类别代码") @ApiModelProperty(value = "水源可用状态类别代码")
...@@ -184,15 +184,15 @@ public class WaterResourceForExportDto extends BaseDto { ...@@ -184,15 +184,15 @@ public class WaterResourceForExportDto extends BaseDto {
@ExcelProperty(value = "管网直径(cm)", index = 16) @ExcelProperty(value = "管网直径(cm)", index = 16)
@ApiModelProperty(value = "管网直径(cm)") @ApiModelProperty(value = "管网直径(cm)")
private Float pipeDiameter; private Double pipeDiameter;
@ExcelProperty(value = "进水管直径(cm)", index = 17) @ExcelProperty(value = "进水管直径(cm)", index = 17)
@ApiModelProperty(value = "进水管直径(cm)") @ApiModelProperty(value = "进水管直径(cm)")
private Float inletPipeDiameter; private Double inletPipeDiameter;
@ExcelProperty(value = "出水管直径(cm)", index = 18) @ExcelProperty(value = "出水管直径(cm)", index = 18)
@ApiModelProperty(value = "出水管直径(cm)") @ApiModelProperty(value = "出水管直径(cm)")
private Float outletPipeDiameter; private Double outletPipeDiameter;
@ExcelProperty(value = "加水车道数量(个)", index = 19) @ExcelProperty(value = "加水车道数量(个)", index = 19)
@ApiModelProperty(value = "加水车道数量(个)") @ApiModelProperty(value = "加水车道数量(个)")
...@@ -257,11 +257,11 @@ public class WaterResourceForExportDto extends BaseDto { ...@@ -257,11 +257,11 @@ public class WaterResourceForExportDto extends BaseDto {
@ExcelProperty(value = "容积(m³)", index = 28) @ExcelProperty(value = "容积(m³)", index = 28)
@ApiModelProperty(value = "容积(m³)") @ApiModelProperty(value = "容积(m³)")
private Float volume; private Double volume;
@ExcelProperty(value = "面积(㎡)", index = 29) @ExcelProperty(value = "面积(㎡)", index = 29)
@ApiModelProperty(value = "面积(㎡)") @ApiModelProperty(value = "面积(㎡)")
private Float area; private Double area;
@ExcelProperty(value = "水质情况", index = 30) @ExcelProperty(value = "水质情况", index = 30)
@ApiModelProperty(value = "水质情况") @ApiModelProperty(value = "水质情况")
...@@ -288,11 +288,11 @@ public class WaterResourceForExportDto extends BaseDto { ...@@ -288,11 +288,11 @@ public class WaterResourceForExportDto extends BaseDto {
@ExcelProperty(value = "取水高度(cm)", index = 34) @ExcelProperty(value = "取水高度(cm)", index = 34)
@ApiModelProperty(value = "取水高度(cm)") @ApiModelProperty(value = "取水高度(cm)")
private Float intakeHeight; private Double intakeHeight;
@ExcelProperty(value = "水源标高差(cm)", index = 35) @ExcelProperty(value = "水源标高差(cm)", index = 35)
@ApiModelProperty(value = "水源标高差(cm)") @ApiModelProperty(value = "水源标高差(cm)")
private Float elevationDifference; private Double elevationDifference;
@ExcelProperty(value = "停车位置", index = 36) @ExcelProperty(value = "停车位置", index = 36)
@ApiModelProperty(value = "停车位置") @ApiModelProperty(value = "停车位置")
...@@ -342,7 +342,7 @@ public class WaterResourceForExportDto extends BaseDto { ...@@ -342,7 +342,7 @@ public class WaterResourceForExportDto extends BaseDto {
// @ExplicitConstraint(indexNum = 42, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory") // @ExplicitConstraint(indexNum = 42, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory")
// @ExcelProperty(value = "设施分类名称", index = 42) // @ExcelProperty(value = "设施分类名称", index = 42)
private String equipCategoryName; private String equipCategoryName;
@ApiModelProperty("设施分类编码") @ApiModelProperty("设施分类编码")
@ExcelIgnore @ExcelIgnore
private String equipCategoryCode; private String equipCategoryCode;
...@@ -376,11 +376,11 @@ public class WaterResourceForExportDto extends BaseDto { ...@@ -376,11 +376,11 @@ public class WaterResourceForExportDto extends BaseDto {
@ExcelProperty(value = "最低报警水位(m)", index = 43) @ExcelProperty(value = "最低报警水位(m)", index = 43)
@ApiModelProperty(value = "最低报警水位(m)") @ApiModelProperty(value = "最低报警水位(m)")
private Float minWaterLevel; private Double minWaterLevel;
@ExcelProperty(value = "最高报警水位(m)", index = 44) @ExcelProperty(value = "最高报警水位(m)", index = 44)
@ApiModelProperty(value = "最高报警水位(m)") @ApiModelProperty(value = "最高报警水位(m)")
private Float maxWaterLevel; private Double maxWaterLevel;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty("水池液位显示装置id") @ApiModelProperty("水池液位显示装置id")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment