徐明浩

起吊装置-台账-excel导出字段对应

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

@@ -25,13 +25,29 @@ public class TSpecdevDzsb extends BaseEntity
     private Long id;
 
     /** 装置名称 */
-    @Excel(name = "装置名称")
+    @Excel(name = "装置")
     private String plantCode;
 
     /** 单元 */
-    @Excel(name = "单元")
+    //@Excel(name = "单元")
     private String unit;
 
+    /** 装置维修组 */
+    @Excel(name = "装置维修组")
+    private String plantMaint;
+
+    /** 工程师 */
+    @Excel(name = "工程师")
+    private String engineer;
+
+    /** 状态 */
+    @Excel(name = "状态", dictType = "spec_dev_status")
+    private Long status;
+
+    /** 审核状态 */
+    //@Excel(name = "审核状态", dictType = "spec_approve_status")
+    private Long approveStatus;
+
     /** 设备名称 */
     @Excel(name = "设备名称")
     private String devname;
@@ -40,14 +56,64 @@ public class TSpecdevDzsb extends BaseEntity
     @Excel(name = "设备位号")
     private String devno;
 
+    /** 档案号 */
+    @Excel(name = "档案号")
+    private String docno;
+
+    /** 型号 */
+    @Excel(name = "设备型号")
+    private String model;
+
+    /** 起吊重量 */
+    @Excel(name = "起吊重量")
+    private String capacity;
+
+    /** 设备使用地点 */
+    @Excel(name = "使用地点")
+    private String location;
+
+    /** 注册代码 */
+    @Excel(name = "注册代码")
+    private String regno;
+
     /** 提交日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "投用日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date submitdate;
 
-    /** 状态 */
-    @Excel(name = "状态", dictType = "spec_dev_status")
-    private Long status;
+    /** 制造单位 */
+    @Excel(name = "制造单位")
+    private String createUnit;
+
+    /** 是否防爆 */
+    @Excel(name = "是否防爆")
+    private String isEx;
+
+    /** 检验单位 */
+    @Excel(name = "检验单位")
+    private String checkUnit;
+
+    /** 检验策略 */
+    @Excel(name = "检验策略")
+    private String checkStrategy;
+
+    /** 上次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "检验日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warnDate;
+
+    /** 下次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次检验日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextWarnDate;
+
+    /** 报告编号 */
+    @Excel(name = "检验报告编号")
+    private String reportNo;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
 
     /** 状态 1 ：正常 ；0：删除 */
     private Long delFlag;
@@ -68,101 +134,36 @@ public class TSpecdevDzsb extends BaseEntity
     //@Excel(name = "部门编号")
     private Long deptId;
 
-    /** 备注 */
-    //@Excel(name = "备注")
-    private String remarks;
-
-    /** 审核状态 */
-    //@Excel(name = "审核状态", dictType = "spec_approve_status")
-    private Long approveStatus;
-
-    /** 注册代码 */
-    @Excel(name = "注册代码")
-    private String regno;
-
     /** 使用证编号 */
-    @Excel(name = "使用证编号")
+    //@Excel(name = "使用证编号")
     private String useno;
 
-    /** 上次年检时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "上次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date warnDate;
-
     /** 检测周期 */
-    @Excel(name = "检测周期")
+    //@Excel(name = "检测周期")
     private Long warnCycle;
 
-    /** 下次年检时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "下次检验日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date nextWarnDate;
-
     /** 预警标识 */
-    @Excel(name = "预警标识")
+    //@Excel(name = "预警标识")
     private Long warnFlag;
 
-    /** 装置维修组 */
-    @Excel(name = "装置维修组")
-    private String plantMaint;
-
-    /** 档案号 */
-    @Excel(name = "档案号")
-    private String docno;
-
-    /** 型号 */
-    @Excel(name = "型号")
-    private String model;
-
-    /** 起吊重量 */
-    @Excel(name = "起吊重量")
-    private String capacity;
-
-    /** 设备使用地点 */
-    @Excel(name = "设备使用地点")
-    private String location;
-
-    /** 制造单位 */
-    @Excel(name = "制造单位")
-    private String createUnit;
-
-    /** 是否防爆 */
-    @Excel(name = "是否防爆")
-    private String isEx;
-    /** 检验策略 */
-    @Excel(name = "检验策略")
-    private String checkStrategy;
-
     /** 年度维保日期 */
     @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 yearMaint;
 
-    /** 报告编号 */
-    @Excel(name = "报告编号")
-    private String reportNo;
-
     /** 最新申请时间 */
     @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 approveTime;
 
     /** 状态修改时间 */
     @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 changeTime;
 
-    /** 检验单位 */
-    @Excel(name = "检验单位")
-    private String checkUnit;
-
-    /** 工程师 */
-    @Excel(name = "工程师")
-    private String engineer;
-
     /** 部门名称 */
     @Excel(name = "部门名称")
-    @TableField(exist = false)
+    //@TableField(exist = false)
     private String deptName;
 
     @TableField(exist = false)