徐明浩

压力容器年检报告-excel导出字段对应
压力管道年检报告-excel导出字段对应

master/src/main/java/com/ruoyi/project/sems/domain/TReportYlgd.java

@@ -49,6 +49,9 @@ public class TReportYlgd extends TReportHiYlgd
     @Excel(name = "管道编号")
     private String devno;
 
+    /** 审核状态 */
+    private Long approveStatus;
+
     /** 管道级别 */
     @Excel(name = "管道级别")
     private String grade;
@@ -176,9 +179,6 @@ public class TReportYlgd extends TReportHiYlgd
     @Excel(name = "检查结论")
     private String con;
 
-    /** 审核状态 */
-    private Long approveStatus;
-
     /** 最新申请时间 */
     private Date approveTime;
 
@@ -186,7 +186,7 @@ public class TReportYlgd extends TReportHiYlgd
     private Long deptId;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
+    //@Excel(name = "部门名称")
     @TableField(exist = false)
     private String deptName;
 

master/src/main/java/com/ruoyi/project/sems/domain/TReportYlrq.java

@@ -28,7 +28,7 @@ public class TReportYlrq extends TReportHiYlrq
     private TSpecdevYlrq devEntity;
 
     /** 装置名称 */
-    @Excel(name = "装置名称")
+    @Excel(name = "装置")
     private String plantCode;
 
     /** 单元 */
@@ -36,21 +36,24 @@ public class TReportYlrq extends TReportHiYlrq
     private String unit;
 
     /** 设备位号 */
-    @Excel(name = "设备位号")
+    @Excel(name = "位号")
     private String devno;
 
+    /** 审核状态 */
+    private Long approveStatus;
+
     /** 设备名称 */
     @Excel(name = "设备名称")
     private String devname;
 
-    /** 注册代码 */
-    @Excel(name = "注册代码")
-    private String regno;
-
     /** 使用证编号 */
-    @Excel(name = "使用证编号")
+    @Excel(name = "使用证号码")
     private String useno;
 
+    /** 注册代码 */
+    @Excel(name = "注册编号")
+    private String regno;
+
     /** 介质 */
     @Excel(name = "介质")
     private String medium;
@@ -72,12 +75,12 @@ public class TReportYlrq extends TReportHiYlrq
     private String optTemp;
 
     /** 安全等级 */
-    @Excel(name = "安全等级")
+    @Excel(name = "安全状况等级")
     private String safeClass;
 
     /** 下次年检时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "下次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "下次定期检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date nextWarnDate;
 
     /** 1 */
@@ -230,9 +233,6 @@ public class TReportYlrq extends TReportHiYlrq
     @Excel(name = "检查结论")
     private String con;
 
-    /** 审核状态 */
-    private Long approveStatus;
-
     /** 最新申请时间 */
     private Date approveTime;
 
@@ -240,7 +240,7 @@ public class TReportYlrq extends TReportHiYlrq
     private Long deptId;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
+    //@Excel(name = "部门名称")
     @TableField(exist = false)
     private String deptName;