From 2d3ded65b3c30b4f5cba6080d9c28e16a0b296cc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 七月 2025 20:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 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 1f173f3..8723d08 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
@@ -118,7 +118,7 @@
/**
* 宸ユ
*/
- @Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4",dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4")
@ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
@Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
private String factoryOrgCode;
@@ -126,7 +126,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;
@@ -162,7 +162,7 @@
/**
* 缁翠慨鐝粍
*/
- @Excel(name = "缁翠慨鐝粍", width = 15, orderNum = "10",dictTable = "eam_base_repair_depart",dicText = "depart_name",dicCode = "org_code")
+ @Excel(name = "缁翠慨鐝粍", width = 15, orderNum = "10")
@ApiModelProperty(value = "缁翠慨鐝粍")
@Dict(dictTable = "eam_base_repair_depart",dicText = "depart_name",dicCode = "org_code")
private String repairDepartOrgCode;
@@ -185,8 +185,9 @@
/**
* 鐏伀鍣�
*/
- @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16")
+ @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16",dicCode = "yn")
@ApiModelProperty(value = "鐏伀鍣�")
+ @Dict(dicCode = "yn")
private String fireExtinguisher;
/**
@@ -321,16 +322,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")
@@ -339,7 +348,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")
@@ -348,14 +357,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")
@@ -363,7 +372,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")
@@ -372,7 +381,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")
@@ -380,7 +389,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")
@@ -388,34 +397,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;
@@ -424,14 +433,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;
@@ -440,7 +449,7 @@
/**
* 澶囨敞
*/
- @Excel(name = "澶囨敞", width = 50, orderNum = "50")
+ @Excel(name = "澶囨敞", width = 50, orderNum = "51")
@ApiModelProperty(value = "澶囨敞")
private String remark;
--
Gitblit v1.9.3