From 8918b2f8444db69be6887c9a0959d13e164bbddb Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 27 八月 2025 14:29:32 +0800
Subject: [PATCH] 设备二保定时服务开发，填充车间二保计划数据，三不放过批量导出接口
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index 7462ff2..1667093 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -257,7 +257,15 @@
/**
* 鍑哄巶鏃ユ湡
*/
- @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "26")
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 25, orderNum = "26")
+ @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private transient String leaveFactory;
+
+ /**
+ * 鍑哄巶鏃ユ湡
+ */
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -389,7 +397,7 @@
/**涓嬫涓変繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "涓嬫涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "43")
+ @Excel(name = "涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "43")
@ApiModelProperty(value = "涓嬫涓変繚鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -410,7 +418,7 @@
private java.util.Date latestTechnologyCheck;
/**鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "46")
+ @Excel(name = "鎶�鏈姸鎬侀壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "46")
@ApiModelProperty(value = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -461,6 +469,22 @@
@ApiModelProperty(value = "涓変繚鐢熸垚鏍囪 1 宸茬敓鎴� 0 鏈敓鎴�")
@TableField(exist = false)
private String thirdMaintenanceGenerateFlag;
+ /** 浜屼繚鐢熸垚鏍囪 1 宸茬敓鎴� 0 鏈敓鎴� */
+ @ApiModelProperty(value = "浜屼繚鐢熸垚鏍囪 1 宸茬敓鎴� 0 鏈敓鎴�")
+ @TableField(exist = false)
+ private String secondMaintenanceGenerateFlag;
+
+ /**
+ * 淇濆吇瑙勮寖鍚嶇О
+ */
+ @TableField(exist = false)
+ private String maintenanceStandardName;
+
+ /**
+ * 淇濆吇瑙勮寖Id
+ */
+ @TableField(exist = false)
+ private String maintenanceStandardId;
public void setFactoryOrgCode(String factoryOrgCode){
--
Gitblit v1.9.3