维保工单导出表头修改

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtWorkOrder.java

@@ -25,11 +25,15 @@ public class GxtWorkOrder extends BaseEntity
     private Long id;
 
     /** 工单编码 */
-//    @Excel(name = "工单编码")
+    @Excel(name = "工单编码")
     private String workOrderProjectNo;
 
+    /** 风机编号 */
+    @Excel(name = "风机编号")
+    private String pcsDeviceName;
+
     /** 工单状态：draft-草稿,to_assign-待派单,assigned-已派单,accepted-已接单,processing-处理中,paused-暂停中,to_approve-待审批,suspended-已挂起,completed-已完成 */
-//    @Excel(name = "工单状态", readConverterExp = "draft=草稿,to_assign=待派单,assigned=已派单,accepted=已接单,processing=处理中,paused=暂停中,to_approve=待审批,suspended=已挂起,completed=已完成")
+    @Excel(name = "工单状态", readConverterExp = "draft=草稿,to_assign=待派单,assigned=已派单,accepted=已接单,processing=处理中,paused=暂停中,to_approve=待审批,suspended=已挂起,completed=已完成,to_finish=待结单,to_archive=待归档,archived=已归档")
     private String workOrderStatus;
 
     /** 维保中心ID */
@@ -52,16 +56,14 @@ public class GxtWorkOrder extends BaseEntity
     /** 风机设备ID */
     private Long pcsDeviceId;
 
-    /** 风机编号 */
-    @Excel(name = "风机编号")
-    private String pcsDeviceName;
+
 
     /** 风机品牌 */
-//    @Excel(name = "风机品牌")
+    @Excel(name = "品牌")
     private String brand;
 
     /** 风机型号 */
-//    @Excel(name = "风机型号")
+    @Excel(name = "机型")
     private String model;
 
     /** 检查类型(年检，半年检，螺栓检) */
@@ -97,18 +99,22 @@ public class GxtWorkOrder extends BaseEntity
 //    @Excel(name = "派单人")
     private String assignUserName;
 
-    /** 接单时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-//    @Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date acceptTime;
-
     /** 接单人ID */
     private Long acceptUserId;
 
     /** 接单人姓名 */
-//    @Excel(name = "接单人")
+    @Excel(name = "接单人")
     private String acceptUserName;
 
+    /** 接单时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    private Date acceptTime;
+
+    /** 班组组长姓名 */
+    @Excel(name = "工作负责人")
+    private String teamLeaderName;
+
     /** 实际开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
@@ -122,9 +128,7 @@ public class GxtWorkOrder extends BaseEntity
     /** 班组组长ID */
     private Long teamLeaderId;
 
-    /** 班组组长姓名 */
-//    @Excel(name = "班组组长")
-    private String teamLeaderName;
+
 
     /** 工作组成员ID */
     private Long workGroupMemberId;
@@ -166,7 +170,7 @@ public class GxtWorkOrder extends BaseEntity
     private BigDecimal planHour;
 
     /** 维保内容 */
-    @Excel(name = "维保内容")
+//    @Excel(name = "维保内容")
     private String content;
 
     /** 实际维保内容 */
@@ -191,11 +195,11 @@ public class GxtWorkOrder extends BaseEntity
     private String reviewContent;
 
     /** 签发人 */
-    @Excel(name = "签发人")
+//    @Excel(name = "签发人")
     private String issuerName;
 
     /** 许可人 */
-    @Excel(name = "许可人")
+//    @Excel(name = "许可人")
     private String permitterName;
 
     /** 评分状态（to_self-待自评，to_re-待复评，to_confirm-待确认，to_final-待终评，to_archive-待归档，archived-已归档） */