徐明浩

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

@@ -167,11 +167,36 @@ public class TSpecdevYlgd extends BaseEntity
     @Excel(name = "安全状况等级")
     private String safeClass;
 
+    /** 下次定期检验日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次定期检验日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextWarnDate;
 
+    /** 报告编号 */
+    @Excel(name = "定期检验报告编号")
+    private String reportNo;
 
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearWarnDate;
+
+    /** 年度检验结论 */
+    @Excel(name = "年度检查结论")
+    private String checkConclusion;
 
+    /** 下次年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearNextWarnDate;
 
+    /** 年度检查报告编号 */
+    @Excel(name = "年度检查报告编号")
+    private String yearReportNo;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
 
     /** 状态 1 ：正常 ；0：删除 */
     private Long delFlag;
@@ -191,57 +216,27 @@ public class TSpecdevYlgd extends BaseEntity
     /** 部门编号 */
     private Long deptId;
 
-    /** 备注 */
-    //@Excel(name = "备注")
-    private String remarks;
-
     /** 检测周期 */
-    @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 checkConclusion;
-
-    /** 报告编号 */
-    @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;
 
-    /** 年度检查日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date yearWarnDate;
-
-    /** 下次年度检查日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "下次年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date yearNextWarnDate;
-
-    /** 年度检查报告编号 */
-    @Excel(name = "年度检查报告编号")
-    private String yearReportNo;
-
     /** 部门名称 */
-    @Excel(name = "部门名称")
+    //@Excel(name = "部门名称")
     @TableField(exist = false)
     private String deptName;