Explorar o código

化验结果明细20个字段改成小数

王苗苗 hai 6 días
pai
achega
453098f9ed

+ 19 - 17
ruoyi-system/src/main/java/com/ruoyi/business/domain/ZAssayResult.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import com.ruoyi.common.annotation.Excel;
 
+import java.math.BigDecimal;
+
 
 /**
  * 化验结果明细对象 z_assay_result
@@ -38,7 +40,7 @@ public class ZAssayResult
 
     /** 样品体积 */
     @Excel(name = "样品体积")
-    private Long sampleVolume;
+    private Double sampleVolume;
 
     /** 化验设备编号 */
     @Excel(name = "化验设备编号")
@@ -54,7 +56,7 @@ public class ZAssayResult
 
     /** 化验ABS值(吸光度) */
     @Excel(name = "化验ABS值", readConverterExp = "吸=光度")
-    private Long resultAbs;
+    private Double resultAbs;
 
     /** 结果日期 */
     @Excel(name = "结果日期")
@@ -66,11 +68,11 @@ public class ZAssayResult
 
     /** 曲线k0 */
     @Excel(name = "曲线k0")
-    private Long curveK0;
+    private Double curveK0;
 
     /** 曲线k1 */
     @Excel(name = "曲线k1")
-    private Long curveK1;
+    private Double curveK1;
 
     /** 曲线唯一id */
     @Excel(name = "曲线唯一id")
@@ -78,51 +80,51 @@ public class ZAssayResult
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901S01;
+    private Double j1901S01;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901D01;
+    private Double j1901D01;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901R01;
+    private Double j1901R01;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901S1;
+    private Double j1901S1;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901D1;
+    private Double j1901D1;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901R1;
+    private Double j1901R1;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901S02;
+    private Double j1901S02;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901D02;
+    private Double j1901D02;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901R02;
+    private Double j1901R02;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901S2;
+    private Double j1901S2;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901D2;
+    private Double j1901D2;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long j1901R2;
+    private Double j1901R2;
 
     /** 化验分类 */
     @Excel(name = "化验分类")
@@ -142,7 +144,7 @@ public class ZAssayResult
 
     /** 原始浓度值 */
     @Excel(name = "原始浓度值")
-    private Long originalConcentration;
+    private Double originalConcentration;
 
     /** 曲线编号 */
     @Excel(name = "曲线编号")