From fd4799fb341ee0dcbae2e59cb52d9112a425e155 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 27 八月 2025 16:44:40 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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 8723d08..42f1518 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
@@ -94,7 +94,6 @@
/**
* 鍏徃
*/
-// @Excel(name = "鍏徃", width = 15, orderNum = "4")
@ApiModelProperty(value = "鍏徃")
@Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
private transient String gsfactoryOrgCode;
@@ -102,7 +101,6 @@
/**
* 涓績
*/
-// @Excel(name = "涓績", width = 15, orderNum = "5")
@ApiModelProperty(value = "涓績")
@Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
private transient String zxfactoryOrgCode;
@@ -110,7 +108,6 @@
/**
* 宸ュ尯
*/
-// @Excel(name = "宸ュ尯", width = 15, orderNum = "6")
@ApiModelProperty(value = "宸ュ尯")
@Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
private transient String gqfactoryOrgCode;
@@ -257,7 +254,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")
@@ -280,7 +285,7 @@
/**
* 楠屾敹鏃ユ湡
*/
- @Excel(name = "鎶曠敤鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "29")
+ @Excel(name = "楠屾敹鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "29")
@ApiModelProperty(value = "楠屾敹鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -389,7 +394,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 +415,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")
@@ -453,6 +458,31 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /** 鎶�鏈姸鎬侀壌瀹氱敓鎴愭爣璁� 1 宸茬敓鎴� 0 鏈敓鎴� */
+ @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氱敓鎴愭爣璁� 1 宸茬敓鎴� 0 鏈敓鎴�")
+ @TableField(exist = false)
+ private String technologyGenerateFlag;
+ /** 涓変繚鐢熸垚鏍囪 1 宸茬敓鎴� 0 鏈敓鎴� */
+ @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){
this.factoryOrgCode = factoryOrgCode;
--
Gitblit v1.9.3