修改bug

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

@@ -152,7 +152,7 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "高度（cm）", index = 11)
 	@ApiModelProperty(value = "高度（cm）")
-	private float height;
+	private Float height;
 
 	@ExcelIgnore
 	@ApiModelProperty(value = "水源可用状态类别代码")
@@ -182,15 +182,15 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "管网直径（cm）", index = 16)
 	@ApiModelProperty(value = "管网直径（cm）")
-	private float pipeDiameter;
+	private Float pipeDiameter;
 
 	@ExcelProperty(value = "进水管直径(cm)", index = 17)
 	@ApiModelProperty(value = "进水管直径(cm)")
-	private float inletPipeDiameter;
+	private Float inletPipeDiameter;
 
 	@ExcelProperty(value = "出水管直径(cm)", index = 18)
 	@ApiModelProperty(value = "出水管直径(cm)")
-	private float outletPipeDiameter;
+	private Float outletPipeDiameter;
 
 	@ExcelProperty(value = "加水车道数量(个)", index = 19)
 	@ApiModelProperty(value = "加水车道数量(个)")
@@ -255,11 +255,11 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "容积（m³）", index = 28)
 	@ApiModelProperty(value = "容积（m³）")
-	private float volume;
+	private Float volume;
 
 	@ExcelProperty(value = "面积（㎡）", index = 29)
 	@ApiModelProperty(value = "面积（㎡）")
-	private float area;
+	private Float area;
 
 	@ExcelProperty(value = "水质情况", index = 30)
 	@ApiModelProperty(value = "水质情况")
@@ -286,11 +286,11 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "取水高度(cm)", index = 34)
 	@ApiModelProperty(value = "取水高度(cm)")
-	private float intakeHeight;
+	private Float intakeHeight;
 
 	@ExcelProperty(value = "水源标高差(cm)", index = 35)
 	@ApiModelProperty(value = "水源标高差(cm)")
-	private float elevationDifference;
+	private Float elevationDifference;
 
 	@ExcelProperty(value = "停车位置", index = 36)
 	@ApiModelProperty(value = "停车位置")
@@ -374,11 +374,11 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "最低报警水位（m）", index = 43)
 	@ApiModelProperty(value = "最低报警水位（m）")
-	private float minWaterLevel;
+	private Float minWaterLevel;
 
 	@ExcelProperty(value = "最高报警水位（m）", index = 44)
 	@ApiModelProperty(value = "最高报警水位（m）")
-	private float maxWaterLevel;
+	private Float maxWaterLevel;
 
 	@ExcelIgnore
 	@ApiModelProperty("水池液位显示装置id")

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceCrane.java

@@ -31,7 +31,7 @@ public class WaterResourceCrane extends BaseEntity {
 	  * 高度（cm）
      */
 	@TableField("height")
-    private float height;
+    private Float height;
     /**
 	  * 水源可用状态类别代码
      */
@@ -66,17 +66,17 @@ public class WaterResourceCrane extends BaseEntity {
 	  * 官网直径（cm）
      */
 	@TableField("pipe_diameter")
-    private float pipeDiameter;
+    private Float pipeDiameter;
     /**
 	  * 进水管直径(cm)
      */
 	@TableField("inlet_pipe_diameter")
-    private float inletPipeDiameter;
+    private Float inletPipeDiameter;
     /**
 	  * 出水管直径(cm)
      */
 	@TableField("outlet_pipe_diameter")
-    private float outletPipeDiameter;
+    private Float outletPipeDiameter;
     /**
 	  * 加水车道数量(个)
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceNatural.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -7,6 +8,8 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
+
 /**
 * 
 *
@@ -31,7 +34,7 @@ public class WaterResourceNatural extends BaseEntity {
 	  * 高度（cm）
      */
 	@TableField("height")
-    private float height;
+    private Float height;
     /**
 	  * 水源类型代码
      */
@@ -46,12 +49,12 @@ public class WaterResourceNatural extends BaseEntity {
 	  * 容积（m³）
      */
 	@TableField("volume")
-    private float volume;
+    private Float volume;
     /**
 	  * 面积（㎡）
      */
 	@TableField("area")
-    private float area;
+    private Float area;
     /**
 	  * 水质情况
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourcePool.java

@@ -31,7 +31,7 @@ public class WaterResourcePool extends BaseEntity {
 	  * 容积（m³）
      */
 	@TableField("volume")
-    private float volume;
+    private Float volume;
     /**
 	  * 水源可用状态类别代码
      */
@@ -56,12 +56,12 @@ public class WaterResourcePool extends BaseEntity {
 	  * 取水高度(cm)
      */
 	@TableField("intake_height")
-    private float intakeHeight;
+    private Float intakeHeight;
     /**
 	  * 水源标高差(cm)
      */
 	@TableField("elevation_difference")
-    private float elevationDifference;
+    private Float elevationDifference;
     /**
 	  * 停车位置
      */
@@ -92,13 +92,13 @@ public class WaterResourcePool extends BaseEntity {
      * 最低报警水位
      */
     @TableField("min_water_level")
-    private float minWaterLevel;
+    private Float minWaterLevel;
 
     /**
      * 最高报警水位
      */
     @TableField("max_water_level")
-    private float maxWaterLevel;
+    private Float maxWaterLevel;
 
     /**
      * 水池液位显示装置id

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportLogMapper.xml

@@ -127,6 +127,6 @@
 			</if>
 		</where>
 		ORDER BY
-		report_date_desc DESC
+		create_date DESC
 	</select>
 </mapper>