徐明浩

显示数据替换：
导出excel的数据状态类型
提交日期 → 投用日期

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

@@ -42,11 +42,11 @@ public class TSpecdevCc extends BaseEntity
 
     /** 提交日期 */
     @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 submitdate;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态", dictType = "spec_dev_status")
     private Long status;
 
     /** 状态 0 ：正常 ；-1：删除 */
@@ -69,11 +69,11 @@ public class TSpecdevCc extends BaseEntity
     private Long deptId;
 
     /** 备注 */
-    @Excel(name = "备注")
+    //@Excel(name = "备注")
     private String remarks;
 
     /** 审核状态 */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态", dictType = "spec_approve_status")
     private Long approveStatus;
 
     /** 注册代码 */
@@ -84,17 +84,17 @@ public class TSpecdevCc extends BaseEntity
     @Excel(name = "使用证编号")
     private String useno;
 
-    /** 上次年检时间 */
+    /** 检验日期 */
     @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 warnDate;
 
     /** 检测周期 */
     private Long warnCycle;
 
-    /** 下次年检时间 */
+    /** 下次检验日期 */
     @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;
 
     /** 预警标识 */

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

@@ -47,11 +47,11 @@ public class TSpecdevDt extends BaseEntity
 
     /** 提交日期 */
     @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 submitdate;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态", dictType = "spec_dev_status")
     private Long status;
 
     /** 状态 0 ：正常 ；-1：删除 */
@@ -74,11 +74,11 @@ public class TSpecdevDt extends BaseEntity
     private Long deptId;
 
     /** 备注 */
-    @Excel(name = "备注")
+    //@Excel(name = "备注")
     private String remarks;
 
     /** 审核状态 */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态", dictType = "spec_approve_status")
     private Long approveStatus;
 
     /** 注册代码 */
@@ -89,9 +89,9 @@ public class TSpecdevDt extends BaseEntity
     @Excel(name = "使用证编号")
     private String useno;
 
-    /** 上次年检时间 */
+    /** 检验日期 */
     @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 warnDate;
 
     /** 检测周期 */

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

@@ -42,11 +42,11 @@ public class TSpecdevDzsb extends BaseEntity
 
     /** 提交日期 */
     @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 submitdate;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态", dictType = "spec_dev_status")
     private Long status;
 
     /** 状态 1 ：正常 ；0：删除 */
@@ -65,15 +65,15 @@ public class TSpecdevDzsb extends BaseEntity
     private Date updatedate;
 
     /** 部门编号 */
-    @Excel(name = "部门编号")
+    //@Excel(name = "部门编号")
     private Long deptId;
 
     /** 备注 */
-    @Excel(name = "备注")
+    //@Excel(name = "备注")
     private String remarks;
 
     /** 审核状态 */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态", dictType = "spec_approve_status")
     private Long approveStatus;
 
     /** 注册代码 */
@@ -95,7 +95,7 @@ public class TSpecdevDzsb extends BaseEntity
 
     /** 下次年检时间 */
     @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;
 
     /** 预警标识 */

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

@@ -46,7 +46,7 @@ public class TSpecdevYlgd extends BaseEntity
     private Date submitdate;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态", dictType = "spec_dev_status")
     private Long status;
 
     /** 状态 1 ：正常 ；0：删除 */
@@ -68,11 +68,11 @@ public class TSpecdevYlgd extends BaseEntity
     private Long deptId;
 
     /** 备注 */
-    @Excel(name = "备注")
+    //@Excel(name = "备注")
     private String remarks;
 
     /** 审核状态 */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态", dictType = "spec_approve_status")
     private Long approveStatus;
 
     /** 注册代码 */
@@ -83,18 +83,18 @@ public class TSpecdevYlgd extends BaseEntity
     @Excel(name = "使用证编号")
     private String useno;
 
-    /** 上次检测时间 */
+    /** 定期检验日期 */
     @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 warnDate;
 
     /** 检测周期 */
     @Excel(name = "检测周期")
     private Long warnCycle;
 
-    /** 下次检测时间 */
+    /** 下次定期检验日期 */
     @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;
 
     /** 预警标识 */
@@ -215,9 +215,9 @@ public class TSpecdevYlgd extends BaseEntity
     @Excel(name = "是否涉危化品")
     private String isDanger;
 
-    /** 安装日期 */
+    /** 安装年月 */
     @JsonFormat(pattern = "yyyy-MM" , timezone = "GMT+8")
-    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "安装年月", width = 30, dateFormat = "yyyy-MM-dd")
     private Date installDate;
 
     /** 年度检查日期 */