From 85bec1c62da9a0aa9e3d676b8e272e4a57efff5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= <KHD@202305>
Date: Fri, 18 Oct 2024 15:01:21 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-18=20=E8=AE=BE=E5=A4=87-=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E8=AE=B0=E5=BD=95-=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/device/domain/EquOperation.java    | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

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 233abf5c..826eb03e 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<Date> createTimeArray;