危险工程

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringDangerous.java

@@ -92,15 +92,15 @@ public class ZEngineeringDangerous extends BaseEntity {
     /**
      * 危险作业坑大小(长)
      */
-    private Long hazardousWorkPitsLong;
+    private BigDecimal hazardousWorkPitsLong;
     /**
      * 危险作业坑大小(宽)
      */
-    private Long hazardousWorkPitsWide;
+    private BigDecimal hazardousWorkPitsWide;
     /**
      * 危险作业坑大小(深)
      */
-    private Long hazardousWorkPitsDeep;
+    private BigDecimal hazardousWorkPitsDeep;
     /**
      * 是否需要支护
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringDangerousBo.java

@@ -6,14 +6,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
-import java.util.Date;
 
 import java.util.Date;
-import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
 import com.ruoyi.common.core.domain.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
+
 
 /**
  * 危险工程业务对象 z_engineering_dangerous
@@ -35,25 +33,25 @@ public class ZEngineeringDangerousBo extends BaseEntity {
     /**
      * 作业基本信息
      */
-   // @NotBlank(message = "作业基本信息不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "作业基本信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String basicInformation;
 
     /**
      * 工程名称
      */
-    //@NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginName;
 
     /**
      * 工程地点
      */
-   // @NotBlank(message = "工程地点不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程地点不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginAddre;
 
     /**
      * 工程时间
      */
-   // @NotNull(message = "工程时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "工程时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date enginTime;
 
     /**
@@ -126,19 +124,19 @@ public class ZEngineeringDangerousBo extends BaseEntity {
      * 危险作业坑大小(长)
      */
     //@NotNull(message = "危险作业坑大小(长)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long hazardousWorkPitsLong;
+    private Double hazardousWorkPitsLong;
 
     /**
      * 危险作业坑大小(宽)
      */
     //@NotNull(message = "危险作业坑大小(宽)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long hazardousWorkPitsWide;
+    private Double hazardousWorkPitsWide;
 
     /**
      * 危险作业坑大小(深)
      */
     //@NotNull(message = "危险作业坑大小(深)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long hazardousWorkPitsDeep;
+    private Double hazardousWorkPitsDeep;
 
     /**
      * 是否需要支护

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringDangerousVo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.zdsz.domain.vo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -126,19 +127,19 @@ public class ZEngineeringDangerousVo extends BaseEntity implements Serializable
      * 危险作业坑大小(长)
      */
     @ExcelProperty(value = "危险作业坑大小(长)")
-    private Long hazardousWorkPitsLong;
+    private BigDecimal hazardousWorkPitsLong;
 
     /**
      * 危险作业坑大小(宽)
      */
     @ExcelProperty(value = "危险作业坑大小(宽)")
-    private Long hazardousWorkPitsWide;
+    private BigDecimal hazardousWorkPitsWide;
 
     /**
      * 危险作业坑大小(深)
      */
     @ExcelProperty(value = "危险作业坑大小(深)")
-    private Long hazardousWorkPitsDeep;
+    private BigDecimal hazardousWorkPitsDeep;
 
     /**
      * 是否需要支护