qingchunxiao před 3 týdny
rodič
revize
9c6879e683

+ 8 - 9
taphole-l2/src/main/java/com/sckj/l2/entity/TL2Data.java

@@ -36,7 +36,8 @@ public class TL2Data implements Serializable {
     private String boilerId;
 
     @ApiModelProperty(value = "铁口区域编号")
-    @ExcelIgnore
+    @ExcelProperty("铁口区域编号")
+    @ColumnWidth(25)
     private String tapholeId;
 
     @TableId(value = "iron_no", type = IdType.INPUT)
@@ -57,8 +58,8 @@ public class TL2Data implements Serializable {
     @ColumnWidth(25)
     private Double ironWeight;
 
-    @ApiModelProperty(value = "实际渣量")
-    @ExcelProperty("实际渣量(t)")
+    @ApiModelProperty(value = "渣量")
+    @ExcelProperty("渣量(t)")
     @ColumnWidth(25)
     private Double slagWeight;
 
@@ -73,20 +74,20 @@ public class TL2Data implements Serializable {
     private Double mudWeight;
 
     @ApiModelProperty(value = "钻杆直径")
-    @ExcelIgnore
+    @ExcelProperty("钻杆直径(mm)")
+    @ColumnWidth(25)
     private Double pollMm;
 
     //计算公式中需要设置类型为double
     @ApiModelProperty(value = "开口深度")
-    @ExcelIgnore
+    @ExcelProperty("开口深度(mm)")
+    @ColumnWidth(25)
     private Double openDepth;
 
     @ApiModelProperty(value = "开始时间")
-    @ExcelIgnore
     private String ironStarttime;
 
     @ExcelProperty("结束时间")
-    @ExcelIgnore
     private String ironEndtime;
 
     @ApiModelProperty(value = "碳")
@@ -94,7 +95,6 @@ public class TL2Data implements Serializable {
     private String elementC;
 
     @ApiModelProperty(value = "硅")
-    @ExcelIgnore
     private String elementSi;
 
     @ApiModelProperty(value = "锰")
@@ -106,7 +106,6 @@ public class TL2Data implements Serializable {
     private String elementP;
 
     @ApiModelProperty(value = "硫")
-    @ExcelIgnore
     private String elementS;
 
     @ApiModelProperty(value = "钛")