From 11e49d47347abfda87d8716fd6c03f7817b79f6a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 16 十月 2023 11:22:30 +0800
Subject: [PATCH] 设备台账增加 检定 二保 三保 时间
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 4148c77..be02299 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -315,6 +315,42 @@
@Dict(dicCode = "property_status")
@Excel(width = 15,orderNum = "41",dicCode = "property_status",name = "璧勪骇鐘舵��")
private String propertyStatus;
+
+ @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")
+ private java.util.Date technologyStatusExpirationTime;
+
+ @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")
+ private java.util.Date technologyStatusQualificationTime;
+
+ @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")
+ private java.util.Date nextTechnologyStatusQualificationTime;
+
+ @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")
+ private java.util.Date secondMaintenanceTime;
+
+ @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")
+ private java.util.Date nextSecondMaintenanceTime;
+
+ @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")
+ private java.util.Date thirdMaintenanceTime;
+
+ @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")
+ private java.util.Date nextThirdMaintenanceTime;
+
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@TableField(exist = false)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java
index f6fa6c8..2a6d990 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java
@@ -112,5 +112,6 @@
/**鎵�灞為儴闂�*/
@Excel(name = "鎵�灞為儴闂�", width = 15)
@ApiModelProperty(value = "鎵�灞為儴闂�")
+ @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String departId;
}
--
Gitblit v1.9.3