From 4371080df058a549cdaf31dddeca6c5fee58e23b Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 15:31:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java
index f219d33..625851d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java
@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -53,32 +51,32 @@
@ApiModelProperty(value = "yearMonth")
private String yearMonth;
/**totalAvailableTime*/
- @Excel(name = "totalAvailableTime", width = 15)
- @ApiModelProperty(value = "totalAvailableTime")
+ @Excel(name = "鎬诲彲鍒╃敤鏃堕棿锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "鎬诲彲鍒╃敤鏃堕棿锛堝皬鏃讹級")
private String totalAvailableTime;
/**noFaultTime*/
- @Excel(name = "noFaultTime", width = 15)
- @ApiModelProperty(value = "noFaultTime")
+ @Excel(name = "鏃犳晠闅滄椂闂达紙灏忔椂锛�", width = 15)
+ @ApiModelProperty(value = "鏃犳晠闅滄椂闂达紙灏忔椂锛�")
private String noFaultTime;
/**faultTime*/
- @Excel(name = "faultTime", width = 15)
- @ApiModelProperty(value = "faultTime")
+ @Excel(name = "鏁呴殰鏃堕棿锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "鏁呴殰鏃堕棿锛堝皬鏃讹級")
private String faultTime;
/**repairTime*/
- @Excel(name = "repairTime", width = 15)
- @ApiModelProperty(value = "repairTime")
+ @Excel(name = "淇鏃堕棿锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "淇鏃堕棿锛堝皬鏃讹級")
private String repairTime;
/**faultNumber*/
- @Excel(name = "faultNumber", width = 15)
- @ApiModelProperty(value = "faultNumber")
+ @Excel(name = "鏁呴殰娆℃暟", width = 15)
+ @ApiModelProperty(value = "鏁呴殰娆℃暟")
private String faultNumber;
/**averageRepairTime*/
- @Excel(name = "averageRepairTime", width = 15)
- @ApiModelProperty(value = "averageRepairTime")
+ @Excel(name = "MTTM锛堝钩鍧囦慨澶嶆椂闂达級锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "MTTM锛堝钩鍧囦慨澶嶆椂闂达級锛堝皬鏃讹級")
private String averageRepairTime;
/**averageFaultIntervalTime*/
- @Excel(name = "averageFaultIntervalTime", width = 15)
- @ApiModelProperty(value = "averageFaultIntervalTime")
+ @Excel(name = "MTBF锛堝钩鍧囨晠闅滈棿闅旀椂闂达級锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "MTBF锛堝钩鍧囨晠闅滈棿闅旀椂闂达級锛堝皬鏃讹級")
private String averageFaultIntervalTime;
/**createBy*/
@ApiModelProperty(value = "createBy")
@@ -96,4 +94,28 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "updateTime")
private Date updateTime;
+
+ @TableField(exist = false)
+ private String equipmentNum;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
+ @TableField(exist = false)
+ private String userDepart;
+
+ @TableField(exist = false)
+ private String startTime;
+
+ @TableField(exist = false)
+ private String endTime;
+
+ @TableField(exist = false)
+ private String serviceabilityRate; //瀹屽ソ鐜�
+
+ @TableField(exist = false)
+ private String startRate;//寮�鍔ㄧ巼
+
+ @TableField(exist = false)
+ private String equipmentNumer;
}
--
Gitblit v1.9.3