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 | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 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 30cf1c6..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 @@ -51,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") @@ -104,5 +104,18 @@ @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