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 | 86 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 23 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 e96653e..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;
@@ -126,7 +123,7 @@
/**
* 鎵�灞炲垎绫�
*/
- @Excel(name = "鎵�灞炲垎绫�", width = 15, orderNum = "5")
+ @Excel(name = "鎵�灞炲垎绫�", width = 15, orderNum = "5",dicCode = "equipment_category")
@ApiModelProperty(value = "鎵�灞炲垎绫�")
@Dict(dicCode = "equipment_category")
private String equipmentCategory;
@@ -164,6 +161,7 @@
*/
@Excel(name = "缁翠慨鐝粍", width = 15, orderNum = "10")
@ApiModelProperty(value = "缁翠慨鐝粍")
+ @Dict(dictTable = "eam_base_repair_depart",dicText = "depart_name",dicCode = "org_code")
private String repairDepartOrgCode;
/**
@@ -184,8 +182,9 @@
/**
* 鐏伀鍣�
*/
- @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16")
+ @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16",dicCode = "yn")
@ApiModelProperty(value = "鐏伀鍣�")
+ @Dict(dicCode = "yn")
private String fireExtinguisher;
/**
@@ -255,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")
@@ -278,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")
@@ -320,16 +327,24 @@
private String equipmentSpecification;
/**
+ * 鐪熺┖鐑鐞嗙倝
+ */
+ @Excel(name = "鐪熺┖鐑鐞嗙倝", width = 15, orderNum = "35")
+ @ApiModelProperty(value = "鐪熺┖鐑鐞嗙倝")
+ @Dict(dicCode = "yn")
+ private String trueHeatTreatment;
+
+ /**
* 鎬诲姛鐜�(KW)
*/
- @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "35")
+ @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "36")
@ApiModelProperty(value = "鎬诲姛鐜�")
private String equipmentPower;
/**
* 璐ㄤ繚寮�濮嬫棩鏈�
*/
- @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 15, orderNum = "36")
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 25, format = "yyyy/MM/dd", orderNum = "37")
@ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -338,7 +353,7 @@
/**
* 璐ㄤ繚缁撴潫鏃ユ湡
*/
- @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15, orderNum = "37")
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "38")
@ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -347,14 +362,14 @@
/**
* 璧勪骇鐘舵��
*/
- @Excel(name = "璧勪骇鐘舵��", width = 15, orderNum = "38",dicCode = "asset_status")
+ @Excel(name = "璧勪骇鐘舵��", width = 15, orderNum = "39",dicCode = "asset_status")
@ApiModelProperty(value = "璧勪骇鐘舵��")
@Dict(dicCode = "asset_status")
private String assetStatus;
/**鏈�鏂颁簩淇濇棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鏈�鏂颁簩淇濇棩鏈�", width = 15, orderNum = "39")
+ @Excel(name = "鏈�鏂颁簩淇濇棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "40")
@ApiModelProperty(value = "鏈�鏂颁簩淇濇棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -362,7 +377,7 @@
/**涓嬫浜屼繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "涓嬫浜屼繚鏃ユ湡", width = 15, orderNum = "40")
+ @Excel(name = "涓嬫浜屼繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "41")
@ApiModelProperty(value = "涓嬫浜屼繚鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -371,7 +386,7 @@
/**鏈涓変繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "鏈涓変繚鏃ユ湡", width = 15, orderNum = "41")
+ @Excel(name = "鏈涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd",orderNum = "42")
@ApiModelProperty(value = "鏈涓変繚鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -379,7 +394,7 @@
/**涓嬫涓変繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "涓嬫涓変繚鏃ユ湡", width = 15, orderNum = "42")
+ @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")
@@ -387,34 +402,34 @@
/**涓変繚鍛ㄦ湡(骞�)*/
@TableField(exist = false)
- @Excel(name = "涓変繚鍛ㄦ湡(骞�)", width = 15, orderNum = "43")
+ @Excel(name = "涓変繚鍛ㄦ湡(骞�)", width = 15, orderNum = "44")
@ApiModelProperty(value = "涓変繚鍛ㄦ湡(骞�)")
private Integer thirdMaintenancePeriod;
/**鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�", width = 15, orderNum = "44")
+ @Excel(name = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "45")
@ApiModelProperty(value = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date latestTechnologyCheck;
/**鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�", width = 15, orderNum = "45")
+ @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")
private java.util.Date nextTechnologyCheck;
/**鎶�鏈壌瀹氬懆鏈�(骞�)*/
@TableField(exist = false)
- @Excel(name = "鎶�鏈壌瀹氬懆鏈�(骞�)", width = 15, orderNum = "46")
+ @Excel(name = "鎶�鏈壌瀹氬懆鏈�(骞�)", width = 15, orderNum = "47")
@ApiModelProperty(value = "鎶�鏈壌瀹氬懆鏈�(骞�)")
private Integer technologyCheckPeriod;
/**
* 鏄惁涓昏澶�
*/
- @Excel(name = "鏄惁涓昏澶�", width = 15, dicCode = "yn", orderNum = "47")
+ @Excel(name = "鏄惁涓昏澶�", width = 15, dicCode = "yn", orderNum = "48")
@ApiModelProperty(value = "鏄惁涓昏澶�")
@Dict(dicCode = "yn")
private String masterFlag;
@@ -423,14 +438,14 @@
/**
* 鏄惁鏈夊伐鑹哄弬鏁�
*/
- @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "yn", orderNum = "48")
+ @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "yn", orderNum = "49")
@ApiModelProperty(value = "鏄惁鏈夊伐鑹哄弬鏁�")
@Dict(dicCode = "yn")
private String processParametersFlag;
/**
* 鏄惁鏈夌簿搴﹀弬鏁�
*/
- @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "yn", orderNum = "49")
+ @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "yn", orderNum = "50")
@ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�")
@Dict(dicCode = "yn")
private String precisionParametersFlag;
@@ -439,10 +454,35 @@
/**
* 澶囨敞
*/
- @Excel(name = "澶囨敞", width = 50, orderNum = "50")
+ @Excel(name = "澶囨敞", width = 50, orderNum = "51")
@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