From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java | 72 ++++++++++++++---------------------
1 files changed, 29 insertions(+), 43 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 9bd4ba0..a1284a4 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
@@ -2,18 +2,17 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
-import java.util.Date;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -31,28 +30,42 @@
private static final long serialVersionUID = -7163039765166584824L;
- /**
- * 宸ヤ綔鏃ュ巻id
- */
- @ApiModelProperty(value = "宸ヤ綔鏃ュ巻id")
- private String calendarId;
+ @Excel(name = "璁惧缂栧彿", width = 20)
+ @ApiModelProperty("璁惧缂栧彿")
+ private String equipmentId;
+
+ @TableField(exist = false)
+ @Excel(name = "璁惧鍚嶇О", width = 20)
+ @ApiModelProperty("璁惧鍚嶇О")
+ private String equipmentName;
+
+ @ApiModelProperty("鏃ユ湡")
+ @Excel(name = "鏃ユ湡", width = 20)
+ private String theDate;
+
+// @Excel(name = "鑷姩璁＄畻鏍囪瘑", width = 15)
+ @ApiModelProperty("鑷姩璁＄畻鏍囪瘑")
+ private Integer autoFlag = CommonConstant.AUTO_FLAG_N;
/**
* 鍔犵彮寮�濮嬫椂闂�
*/
- @Excel(name = "鍔犵彮寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍔犵彮寮�濮嬫椂闂�", width = 20)
@ApiModelProperty(value = "鍔犵彮寮�濮嬫椂闂�")
- private Date startTime;
+ private String startTime;
/**
* 鍔犵彮缁撴潫鏃堕棿
*/
- @Excel(name = "鍔犵彮缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍔犵彮缁撴潫鏃堕棿", width = 20)
@ApiModelProperty(value = "鍔犵彮缁撴潫鏃堕棿")
- private Date endTime;
+ private String endTime;
+
+ /**
+ * 鍔犵彮鏃堕暱
+ */
+ @Excel(name = "鏃堕暱", width = 20)
+ @ApiModelProperty(value = "鏃堕暱")
+ private BigDecimal duration;
/**
* 澶囨敞
@@ -60,33 +73,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 = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("鐝寮�濮嬫椂闂�")
- private String startDate;
-
- /**
- * 鐝缁撴潫鏃堕棿
- */
- @Excel(name = "鐝缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("鐝缁撴潫鏃堕棿")
- private String endDate;
/**
* 鍓嶅彴浼犲叆 鍒ゆ柇姣忎釜id
--
Gitblit v1.9.3