diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java index 233abf5ce..826eb03e1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java @@ -50,13 +50,13 @@ public class EquOperation extends BaseEntity { /** * 故障时间 */ - @Excel(name = "故障时间") + @Excel(name = "故障停机时间") private String faultTime; /** * 实际运行时间;运行时间-故障时间 */ - @Excel(name = "实际运行时间;运行时间-故障时间") + @Excel(name = "实际运行时间") private String actualOperationTime; /** @@ -71,6 +71,18 @@ public class EquOperation extends BaseEntity { @Excel(name = "故障率") private String failureRate; + /** + * 故障次数 + */ + @Excel(name = "故障次数") + private Integer failureTimes; + + /** + * 停机次数 + */ + @Excel(name = "停机次数") + private Integer shutdownTimes; + /** * 故障描述 */ @@ -83,6 +95,12 @@ public class EquOperation extends BaseEntity { @Excel(name = "原因分析") private String reasonAnalyze; + /** + * 设备状态描述 + */ + @Excel(name = "设备状态描述") + private String equStatusDes; + /** * 处理方式 */ @@ -95,12 +113,6 @@ public class EquOperation extends BaseEntity { @Excel(name = "维修人") private String repairPerson; - /** - * 设备状态描述 - */ - @Excel(name = "设备状态描述") - private String equStatusDes; - /** * 更换备件 */ @@ -116,19 +128,19 @@ public class EquOperation extends BaseEntity { /** * 备用字段1 */ - @Excel(name = "备用字段1") +// @Excel(name = "备用字段1") private String attr1; /** * 备用字段2 */ - @Excel(name = "备用字段2") +// @Excel(name = "备用字段2") private String attr2; /** * 备用字段3 */ - @Excel(name = "备用字段3") +// @Excel(name = "备用字段3") private String attr3; /** @@ -136,18 +148,6 @@ public class EquOperation extends BaseEntity { */ private String delFlag; - /** - * 故障次数 - */ - @Excel(name = "故障次数") - private Integer failureTimes; - - /** - * 停机次数 - */ - @Excel(name = "停机次数") - private Integer shutdownTimes; - // 创建日期范围list private List createTimeArray;