diff --git a/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java b/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java index 0d5bc79..f91dab7 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java @@ -19,7 +19,7 @@ public class DailyFaultRecord extends BaseEntity private Long id; /** 日期 */ - @Excel(name = "日期") + @Excel(name = "日期" , dateFormat = "yyyy/MM/dd") private String date; /** 位置 */ @@ -47,15 +47,15 @@ public class DailyFaultRecord extends BaseEntity private String faultType; /** 故障发生时间 */ - @Excel(name = "故障发生时间") + @Excel(name = "故障发生时间" , dateFormat = "HH:mm:ss") private String faultOccurrenceTime; /** 处置完毕时间 */ - @Excel(name = "处置完毕时间") + @Excel(name = "处置完毕时间" , dateFormat = "HH:mm:ss") private String handlingCompletionTime; - /** 处置时长,单位:分钟 */ - @Excel(name = "处置时长,单位:分钟") + /** 处置时长 */ + @Excel(name = "处置时长") private Long handlingDuration; public void setId(Long id) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/FaultHandlingRecord.java b/os-ems/src/main/java/com/os/ems/info/domain/FaultHandlingRecord.java index ece9d0d..3787f67 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/FaultHandlingRecord.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/FaultHandlingRecord.java @@ -19,7 +19,7 @@ public class FaultHandlingRecord extends BaseEntity private Long id; /** 故障日期 */ - @Excel(name = "故障日期") + @Excel(name = "故障日期", dateFormat = "yyyy/MM/dd") private String faultDate; /** 故障位置 */ @@ -43,11 +43,11 @@ public class FaultHandlingRecord extends BaseEntity private String impact; /** 故障发生时间 */ - @Excel(name = "故障发生时间") + @Excel(name = "故障发生时间", dateFormat = "HH:mm:ss") private String faultOccurrenceTime; - /** 处置时长,单位:分钟 */ - @Excel(name = "处置时长,单位:分钟") + /** 处置时长 */ + @Excel(name = "处置时长") private Long handlingDuration; /** 维修更换的主要元器件 */ diff --git a/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemPlcBufferBatteryLifecycle.java b/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemPlcBufferBatteryLifecycle.java index d78e922..56a05a3 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemPlcBufferBatteryLifecycle.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemPlcBufferBatteryLifecycle.java @@ -47,51 +47,51 @@ public class LuggageSystemPlcBufferBatteryLifecycle extends BaseEntity private String remarks; /** 第1次 */ - @Excel(name = "第1次") + @Excel(name = "第1次", dateFormat = "yyyy/MM/dd") private String firstInstance; /** 第2次 */ - @Excel(name = "第2次") + @Excel(name = "第2次", dateFormat = "yyyy/MM/dd") private String secondInstance; /** 第3次 */ - @Excel(name = "第3次") + @Excel(name = "第3次", dateFormat = "yyyy/MM/dd") private String thirdInstance; /** 第4次 */ - @Excel(name = "第4次") + @Excel(name = "第4次", dateFormat = "yyyy/MM/dd") private String fourthInstance; /** 第5次 */ - @Excel(name = "第5次") + @Excel(name = "第5次", dateFormat = "yyyy/MM/dd") private String fifthInstance; /** 第6次 */ - @Excel(name = "第6次") + @Excel(name = "第6次", dateFormat = "yyyy/MM/dd") private String sixthInstance; /** 第7次 */ - @Excel(name = "第7次") + @Excel(name = "第7次", dateFormat = "yyyy/MM/dd") private String seventhInstance; /** 第8次 */ - @Excel(name = "第8次") + @Excel(name = "第8次", dateFormat = "yyyy/MM/dd") private String eighthInstance; /** 第9次 */ - @Excel(name = "第9次") + @Excel(name = "第9次", dateFormat = "yyyy/MM/dd") private String ninthInstance; /** 第10次 */ - @Excel(name = "第10次") + @Excel(name = "第10次", dateFormat = "yyyy/MM/dd") private String tenthInstance; /** 第11次 */ - @Excel(name = "第11次") + @Excel(name = "第11次", dateFormat = "yyyy/MM/dd") private String eleventhInstance; /** 第12次 */ - @Excel(name = "第12次") + @Excel(name = "第12次", dateFormat = "yyyy/MM/dd") private String twelfthInstance; public void setObjid(Long objid) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemSecurityDoorBatteryLifecycle.java b/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemSecurityDoorBatteryLifecycle.java index 8721dae..734fdc9 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemSecurityDoorBatteryLifecycle.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemSecurityDoorBatteryLifecycle.java @@ -47,51 +47,51 @@ public class LuggageSystemSecurityDoorBatteryLifecycle extends BaseEntity private String remarks; /** 第1次 */ - @Excel(name = "第1次") + @Excel(name = "第1次", dateFormat = "yyyy/MM/dd") private String firstInstance; /** 第2次 */ - @Excel(name = "第2次") + @Excel(name = "第2次", dateFormat = "yyyy/MM/dd") private String secondInstance; /** 第3次 */ - @Excel(name = "第3次") + @Excel(name = "第3次", dateFormat = "yyyy/MM/dd") private String thirdInstance; /** 第4次 */ - @Excel(name = "第4次") + @Excel(name = "第4次", dateFormat = "yyyy/MM/dd") private String fourthInstance; /** 第5次 */ - @Excel(name = "第5次") + @Excel(name = "第5次", dateFormat = "yyyy/MM/dd") private String fifthInstance; /** 第6次 */ - @Excel(name = "第6次") + @Excel(name = "第6次", dateFormat = "yyyy/MM/dd") private String sixthInstance; /** 第7次 */ - @Excel(name = "第7次") + @Excel(name = "第7次", dateFormat = "yyyy/MM/dd") private String seventhInstance; /** 第8次 */ - @Excel(name = "第8次") + @Excel(name = "第8次", dateFormat = "yyyy/MM/dd") private String eighthInstance; /** 第9次 */ - @Excel(name = "第9次") + @Excel(name = "第9次", dateFormat = "yyyy/MM/dd") private String ninthInstance; /** 第10次 */ - @Excel(name = "第10次") + @Excel(name = "第10次", dateFormat = "yyyy/MM/dd") private String tenthInstance; /** 第11次 */ - @Excel(name = "第11次") + @Excel(name = "第11次", dateFormat = "yyyy/MM/dd") private String eleventhInstance; /** 第12次 */ - @Excel(name = "第12次") + @Excel(name = "第12次", dateFormat = "yyyy/MM/dd") private String twelfthInstance; public void setObjid(Long objid) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySparePartsRegistration.java b/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySparePartsRegistration.java index b6515cf..5efebde 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySparePartsRegistration.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySparePartsRegistration.java @@ -47,51 +47,51 @@ public class PowerEnergySparePartsRegistration extends BaseEntity private String imageLocation; /** 第1次 */ - @Excel(name = "第1次") + @Excel(name = "第1次" , dateFormat = "yyyy/MM/dd") private String firstInstance; /** 第2次 */ - @Excel(name = "第2次") + @Excel(name = "第2次" , dateFormat = "yyyy/MM/dd") private String secondInstance; /** 第3次 */ - @Excel(name = "第3次") + @Excel(name = "第3次" , dateFormat = "yyyy/MM/dd") private String thirdInstance; /** 第4次 */ - @Excel(name = "第4次") + @Excel(name = "第4次" , dateFormat = "yyyy/MM/dd") private String fourthInstance; /** 第5次 */ - @Excel(name = "第5次") + @Excel(name = "第5次" , dateFormat = "yyyy/MM/dd") private String fifthInstance; /** 第6次 */ - @Excel(name = "第6次") + @Excel(name = "第6次" , dateFormat = "yyyy/MM/dd") private String sixthInstance; /** 第7次 */ - @Excel(name = "第7次") + @Excel(name = "第7次" , dateFormat = "yyyy/MM/dd") private String seventhInstance; /** 第8次 */ - @Excel(name = "第8次") + @Excel(name = "第8次" , dateFormat = "yyyy/MM/dd") private String eighthInstance; /** 第9次 */ - @Excel(name = "第9次") + @Excel(name = "第9次" , dateFormat = "yyyy/MM/dd") private String ninthInstance; /** 第10次 */ - @Excel(name = "第10次") + @Excel(name = "第10次" , dateFormat = "yyyy/MM/dd") private String tenthInstance; /** 第11次 */ - @Excel(name = "第11次") + @Excel(name = "第11次" , dateFormat = "yyyy/MM/dd") private String eleventhInstance; /** 第12次 */ - @Excel(name = "第12次") + @Excel(name = "第12次" , dateFormat = "yyyy/MM/dd") private String twelfthInstance; public void setObjid(Long objid) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySupervisionChecklist.java b/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySupervisionChecklist.java index a855ac7..e100ca1 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySupervisionChecklist.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySupervisionChecklist.java @@ -19,7 +19,7 @@ public class PowerEnergySupervisionChecklist extends BaseEntity private Long id; /** 日期 */ - @Excel(name = "日期") + @Excel(name = "日期", dateFormat = "yyyy/MM/dd") private String date; /** 作业类别 */ diff --git a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventory.java b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventory.java index 3c96b8e..440bebb 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventory.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventory.java @@ -19,7 +19,7 @@ public class SparePartsInventory extends BaseEntity private Long objid; /** 入库时间 */ - @Excel(name = "入库时间") + @Excel(name = "入库时间", dateFormat = "yyyy/MM/dd HH:mm:ss") private String warehouseDate; /** 采购方式 */ diff --git a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java index 9d34bf1..006b01c 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java @@ -19,7 +19,7 @@ public class SparePartsUsageRecord extends BaseEntity private Long id; /** 日期 */ - @Excel(name = "日期") + @Excel(name = "日期", dateFormat = "yyyy/MM/dd") private String date; /** 备件名称 */ diff --git a/os-ems/src/main/java/com/os/ems/info/domain/UpsBatteryLifecycle.java b/os-ems/src/main/java/com/os/ems/info/domain/UpsBatteryLifecycle.java index 4851818..06e6c5a 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/UpsBatteryLifecycle.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/UpsBatteryLifecycle.java @@ -51,51 +51,51 @@ public class UpsBatteryLifecycle extends BaseEntity private String remarks; /** 第1次 */ - @Excel(name = "第1次") + @Excel(name = "第1次", dateFormat = "yyyy/MM/dd") private String replacement1; /** 第2次 */ - @Excel(name = "第2次") + @Excel(name = "第2次", dateFormat = "yyyy/MM/dd") private String replacement2; /** 第3次 */ - @Excel(name = "第3次") + @Excel(name = "第3次", dateFormat = "yyyy/MM/dd") private String replacement3; /** 第4次 */ - @Excel(name = "第4次") + @Excel(name = "第4次", dateFormat = "yyyy/MM/dd") private String replacement4; /** 第5次 */ - @Excel(name = "第5次") + @Excel(name = "第5次", dateFormat = "yyyy/MM/dd") private String replacement5; /** 第6次 */ - @Excel(name = "第6次") + @Excel(name = "第6次", dateFormat = "yyyy/MM/dd") private String replacement6; /** 第7次 */ - @Excel(name = "第7次") + @Excel(name = "第7次", dateFormat = "yyyy/MM/dd") private String replacement7; /** 第8次 */ - @Excel(name = "第8次") + @Excel(name = "第8次", dateFormat = "yyyy/MM/dd") private String replacement8; /** 第9次 */ - @Excel(name = "第9次") + @Excel(name = "第9次", dateFormat = "yyyy/MM/dd") private String replacement9; /** 第10次 */ - @Excel(name = "第10次") + @Excel(name = "第10次", dateFormat = "yyyy/MM/dd") private String replacement10; /** 第11次 */ - @Excel(name = "第11次") + @Excel(name = "第11次", dateFormat = "yyyy/MM/dd") private String replacement11; /** 第12次 */ - @Excel(name = "第12次") + @Excel(name = "第12次", dateFormat = "yyyy/MM/dd") private String replacement12; public void setId(Long id)