From 56e8ccde7c982bc2a5b9746edb2e596c895f63e6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 13 十二月 2023 15:20:07 +0800
Subject: [PATCH] 利用率页面添加平均值和合计值
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java | 58 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
index cd049c0..bf2d75d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
@@ -28,6 +28,37 @@
private static final long serialVersionUID = -7163039765166584824L;
+ @TableField(exist = false)
+ @Excel(name = "璁惧缂栧彿", width = 20)
+ private String equipmentId;
+
+ @TableField(exist = false)
+ @Excel(name = "璁惧鍚嶇О", width = 20)
+ private String equipmentName;
+
+ /**
+ * 鐢熸晥鏃ユ湡
+ */
+ @Excel(name = "鐢熸晥鏃ユ湡", width = 15)
+ @TableField(exist = false)
+ private String effectiveDate;
+
+ /**
+ * 鐝寮�濮嬫椂闂�
+ */
+ @Excel(name = "鐝寮�濮嬫椂闂�", width = 20)
+ @ApiModelProperty("鐝寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private String startDate;
+
+ /**
+ * 鐝缁撴潫鏃堕棿
+ */
+ @Excel(name = "鐝缁撴潫鏃堕棿", width = 20)
+ @ApiModelProperty("鐝缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private String endDate;
+
/**
* 宸ヤ綔鏃ュ巻id
*/
@@ -53,33 +84,6 @@
@Excel(name = "澶囨敞")
@ApiModelProperty(value = "澶囨敞")
private String remark;
-
- @TableField(exist = false)
- private String equipmentId;
-
- @TableField(exist = false)
- private String equipmentName;
-
- /**
- * 鐢熸晥鏃ユ湡
- */
- @Excel(name = "鐢熸晥鏃ユ湡", width = 15)
- @TableField(exist = false)
- private String effectiveDate;
-
- /**
- * 鐝寮�濮嬫椂闂�
- */
- @Excel(name = "鐝寮�濮嬫椂闂�", width = 20, format = "HH:mm:ss")
- @ApiModelProperty("鐝寮�濮嬫椂闂�")
- private String startDate;
-
- /**
- * 鐝缁撴潫鏃堕棿
- */
- @Excel(name = "鐝缁撴潫鏃堕棿", width = 20, format = "HH:mm:ss")
- @ApiModelProperty("鐝缁撴潫鏃堕棿")
- private String endDate;
/**
* 鍓嶅彴浼犲叆 鍒ゆ柇姣忎釜id
--
Gitblit v1.9.3