From 377ae830dfa0e7eb3c1f01f448ff097d6321450f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 25 四月 2025 13:23:24 +0800
Subject: [PATCH] art: 设备管理-设备台账- 伪列 添加 手持端使用
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 386 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 237 insertions(+), 149 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 7f5a5d0..0756a99 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
@@ -15,184 +15,272 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+
/**
* @Description: 璁惧鍙拌处
* @Author: jeecg-boot
- * @Date: 2025-03-19
+ * @Date: 2025-03-19
* @Version: V1.0
*/
@Data
@TableName("eam_equipment")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_equipment瀵硅薄", description="璁惧鍙拌处")
+@ApiModel(value = "eam_equipment瀵硅薄", description = "璁惧鍙拌处")
public class EamEquipment implements Serializable {
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private java.lang.String id;
- /**鍒涘缓浜�*/
+ private java.lang.String id;
+ /**
+ * 鍒涘缓浜�
+ */
@ApiModelProperty(value = "鍒涘缓浜�")
- @Dict(dicCode = "sys_user, realname, username")
- private java.lang.String createBy;
- /**鍒涘缓鏃堕棿*/
+ @Dict(dicCode = "sys_user, realname, username")
+ private java.lang.String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
+ private java.util.Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
@ApiModelProperty(value = "鏇存柊浜�")
- @Dict(dicCode = "sys_user, realname, username")
- private java.lang.String updateBy;
- /**鏇存柊鏃堕棿*/
+ @Dict(dicCode = "sys_user, realname, username")
+ private java.lang.String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
- private java.util.Date updateTime;
- /**鍒犻櫎鏍囪*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
+ private java.util.Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- private java.lang.Integer delFlag;
- /**璁惧缁熶竴缂栧彿*/
- @Excel(name = "璁惧缂栧彿", width = 15)
+ private java.lang.Integer delFlag;
+ /**
+ * 璁惧缁熶竴缂栧彿
+ */
+ @Excel(name = "璁惧缂栧彿", width = 15)
@ApiModelProperty(value = "璁惧缂栧彿")
- private java.lang.String equipmentCode;
- /**璁惧鍚嶇О*/
- @Excel(name = "璁惧鍚嶇О", width = 15)
+ private java.lang.String equipmentCode;
+ /**
+ * 璁惧鍚嶇О
+ */
+ @Excel(name = "璁惧鍚嶇О", width = 15)
@ApiModelProperty(value = "璁惧鍚嶇О")
- private java.lang.String equipmentName;
- /**鍏抽敭璁惧鏍囪瘑*/
- @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15, dicCode = "yn")
- @ApiModelProperty(value = "鍏抽敭璁惧鏍囪瘑")
- private java.lang.String equipmentImportance;
- /**鎶�鏈姸鎬�*/
- @Excel(name = "鎶�鏈姸鎬�", width = 15, dicCode = "technology_status")
- @ApiModelProperty(value = "鎶�鏈姸鎬�")
- @Dict(dicCode = "technology_status")
- private java.lang.String technologyStatus;
- /**鎿嶄綔绯荤粺*/
- @Excel(name = "鎿嶄綔绯荤粺", width = 15)
- @ApiModelProperty(value = "鎿嶄綔绯荤粺")
- private java.lang.String operationSystem;
- /**浣跨敤閮ㄩ棬*/
- @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
- @ApiModelProperty(value = "浣跨敤閮ㄩ棬")
- @Dict(dicCode = "mdc_production, production_name, id")
- private java.lang.String orgId;
- /**璁惧绠＄悊鍛�*/
- @Excel(name = "璁惧绠＄悊鍛�", width = 35, dictTable = "sys_user", dicText = "realname", dicCode = "username")
- @ApiModelProperty(value = "璁惧绠＄悊鍛�")
- @Dict(dicCode = "sys_user, realname, username")
- private java.lang.String equipmentManager;
- /**璁惧鍒嗙被*/
- @Excel(name = "璁惧鎵�灞炲垎绫�", width = 15, dicCode = "equipment_category")
- @ApiModelProperty(value = "璁惧鍒嗙被")
- @Dict(dicCode = "equipment_category")
- private java.lang.String equipmentCategory;
- /**璁惧鍨嬪彿*/
- @Excel(name = "璁惧鍨嬪彿", width = 15)
+ private java.lang.String equipmentName;
+ /**
+ * 鍏抽敭璁惧鏍囪瘑
+ */
+ @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15, dicCode = "yn")
+ @ApiModelProperty(value = "鍏抽敭璁惧鏍囪瘑")
+ private java.lang.String equipmentImportance;
+ /**
+ * 鎶�鏈姸鎬�
+ */
+ @Excel(name = "鎶�鏈姸鎬�", width = 15, dicCode = "technology_status")
+ @ApiModelProperty(value = "鎶�鏈姸鎬�")
+ @Dict(dicCode = "technology_status")
+ private java.lang.String technologyStatus;
+ /**
+ * 鎿嶄綔绯荤粺
+ */
+ @Excel(name = "鎿嶄綔绯荤粺", width = 15)
+ @ApiModelProperty(value = "鎿嶄綔绯荤粺")
+ private java.lang.String operationSystem;
+ /**
+ * 浣跨敤閮ㄩ棬
+ */
+ @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
+ @ApiModelProperty(value = "浣跨敤閮ㄩ棬")
+ @Dict(dicCode = "mdc_production, production_name, id")
+ private java.lang.String orgId;
+ /**
+ * 璁惧绠＄悊鍛�
+ */
+ @Excel(name = "璁惧绠＄悊鍛�", width = 35, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+ @ApiModelProperty(value = "璁惧绠＄悊鍛�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private java.lang.String equipmentManager;
+ /**
+ * 璁惧鍒嗙被
+ */
+ @Excel(name = "璁惧鎵�灞炲垎绫�", width = 15, dicCode = "equipment_category")
+ @ApiModelProperty(value = "璁惧鍒嗙被")
+ @Dict(dicCode = "equipment_category")
+ private java.lang.String equipmentCategory;
+ /**
+ * 璁惧鍨嬪彿
+ */
+ @Excel(name = "璁惧鍨嬪彿", width = 15)
@ApiModelProperty(value = "璁惧鍨嬪彿")
- private java.lang.String equipmentModel;
- /**璁惧瑙勬牸*/
- @Excel(name = "璁惧瑙勬牸", width = 15)
+ private java.lang.String equipmentModel;
+ /**
+ * 璁惧瑙勬牸
+ */
+ @Excel(name = "璁惧瑙勬牸", width = 15)
@ApiModelProperty(value = "璁惧瑙勬牸")
- private java.lang.String equipmentSpecification;
- /**涓昏酱杩炴帴灏哄*/
- @Excel(name = "涓昏酱杩炴帴灏哄", width = 25)
- @ApiModelProperty(value = "涓昏酱杩炴帴灏哄")
- private java.lang.String spindleConnectDimension;
- /**鎬诲姛鐜�*/
- @Excel(name = "鎬诲姛鐜�", width = 15)
- @ApiModelProperty(value = "鎬诲姛鐜�")
- private java.lang.String equipmentPower;
- /**瀹夎浣嶇疆*/
- @Excel(name = "瀹夎浣嶇疆", width = 15)
- @ApiModelProperty(value = "瀹夎浣嶇疆")
- private java.lang.String installationPosition;
- /**璧勪骇鐘舵��*/
- @Excel(name = "璧勪骇鐘舵��", width = 15, dicCode = "asset_status")
+ private java.lang.String equipmentSpecification;
+ /**
+ * 涓昏酱杩炴帴灏哄
+ */
+ @Excel(name = "涓昏酱杩炴帴灏哄", width = 25)
+ @ApiModelProperty(value = "涓昏酱杩炴帴灏哄")
+ private java.lang.String spindleConnectDimension;
+ /**
+ * 鎬诲姛鐜�
+ */
+ @Excel(name = "鎬诲姛鐜�", width = 15)
+ @ApiModelProperty(value = "鎬诲姛鐜�")
+ private java.lang.String equipmentPower;
+ /**
+ * 瀹夎浣嶇疆
+ */
+ @Excel(name = "瀹夎浣嶇疆", width = 15)
+ @ApiModelProperty(value = "瀹夎浣嶇疆")
+ private java.lang.String installationPosition;
+ /**
+ * 璧勪骇鐘舵��
+ */
+ @Excel(name = "璧勪骇鐘舵��", width = 15, dicCode = "asset_status")
@ApiModelProperty(value = "璧勪骇鐘舵��")
- @Dict(dicCode = "asset_status")
- private java.lang.String assetStatus;
- /**绔嬮」鍗″彿*/
- @Excel(name = "绔嬮」鍗″彿", width = 15)
- @ApiModelProperty(value = "绔嬮」鍗″彿")
- private java.lang.String cardNumber;
- /**鍑哄巶缂栧彿*/
- @Excel(name = "鍑哄巶缂栧彿", width = 15)
- @ApiModelProperty(value = "鍑哄巶缂栧彿")
- private java.lang.String factoryNumber;
- /**鏈哄簥鍘傚*/
- @Excel(name = "鏈哄簥鍘傚", width = 15)
- @ApiModelProperty(value = "鏈哄簥鍘傚")
- private java.lang.String manufacturingEnterprise;
- /**鏉ユ簮鍥藉*/
- @Excel(name = "鏈哄簥鏉ユ簮鍥藉", width = 25)
- @ApiModelProperty(value = "鏉ユ簮鍥藉")
- private java.lang.String originCountry;
- /**鍑哄巶鏃ユ湡*/
- @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy-MM-dd")
- @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date leaveFactoryDate;
- /**楠屾敹鏃ユ湡*/
- @Excel(name = "楠屾敹鏃ユ湡", width = 25, format = "yyyy-MM-dd")
- @ApiModelProperty(value = "楠屾敹鏃ユ湡")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date acceptanceCheckDate;
- /**璐ㄤ繚寮�濮嬫棩鏈�*/
- @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 25, format = "yyyy-MM-dd")
- @ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date warrantyStartDate;
- /**璐ㄤ繚缁撴潫鏃ユ湡*/
- @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 25, format = "yyyy-MM-dd")
- @ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date warrantyEndDate;
- /**鏄惁瀹炴柦MDC*/
- @Excel(name = "鏄惁瀹炴柦MDC", width = 15, dicCode = "yn")
- @ApiModelProperty(value = "鏄惁瀹炴柦MDC")
- private java.lang.String mdcFlag;
- /*=====================涓婇潰鏄矁鍏嬫ā鏉垮瓧娈�======================*/
- /**鐗圭璁惧;鏄惁涓虹壒绉嶈澶�*/
+ @Dict(dicCode = "asset_status")
+ private java.lang.String assetStatus;
+ /**
+ * 绔嬮」鍗″彿
+ */
+ @Excel(name = "绔嬮」鍗″彿", width = 15)
+ @ApiModelProperty(value = "绔嬮」鍗″彿")
+ private java.lang.String cardNumber;
+ /**
+ * 鍑哄巶缂栧彿
+ */
+ @Excel(name = "鍑哄巶缂栧彿", width = 15)
+ @ApiModelProperty(value = "鍑哄巶缂栧彿")
+ private java.lang.String factoryNumber;
+ /**
+ * 鏈哄簥鍘傚
+ */
+ @Excel(name = "鏈哄簥鍘傚", width = 15)
+ @ApiModelProperty(value = "鏈哄簥鍘傚")
+ private java.lang.String manufacturingEnterprise;
+ /**
+ * 鏉ユ簮鍥藉
+ */
+ @Excel(name = "鏈哄簥鏉ユ簮鍥藉", width = 25)
+ @ApiModelProperty(value = "鏉ユ簮鍥藉")
+ private java.lang.String originCountry;
+ /**
+ * 鍑哄巶鏃ユ湡
+ */
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date leaveFactoryDate;
+ /**
+ * 楠屾敹鏃ユ湡
+ */
+ @Excel(name = "楠屾敹鏃ユ湡", width = 25, format = "yyyy-MM-dd")
+ @ApiModelProperty(value = "楠屾敹鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date acceptanceCheckDate;
+ /**
+ * 璐ㄤ繚寮�濮嬫棩鏈�
+ */
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 25, format = "yyyy-MM-dd")
+ @ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date warrantyStartDate;
+ /**
+ * 璐ㄤ繚缁撴潫鏃ユ湡
+ */
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 25, format = "yyyy-MM-dd")
+ @ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date warrantyEndDate;
+ /**
+ * 鏄惁瀹炴柦MDC
+ */
+ @Excel(name = "鏄惁瀹炴柦MDC", width = 15, dicCode = "yn")
+ @ApiModelProperty(value = "鏄惁瀹炴柦MDC")
+ private java.lang.String mdcFlag;
+ /*=====================涓婇潰鏄矁鍏嬫ā鏉垮瓧娈�======================*/
+ /**
+ * 鐗圭璁惧;鏄惁涓虹壒绉嶈澶�
+ */
@ApiModelProperty(value = "鏄惁鐗圭璁惧")
- private java.lang.String specialEquipment;
- /**璁惧鍥剧墖*/
+ private java.lang.String specialEquipment;
+ /**
+ * 璁惧鍥剧墖
+ */
@ApiModelProperty(value = "璁惧鍥剧墖")
- private java.lang.String equipmentImage;
- /**閲嶉噺*/
+ private java.lang.String equipmentImage;
+ /**
+ * 閲嶉噺
+ */
@ApiModelProperty(value = "閲嶉噺")
- private java.lang.String equipmentWeight;
- /**鏄惁鏈夊伐鑹哄弬鏁�*/
+ private java.lang.String equipmentWeight;
+ /**
+ * 鏄惁鏈夊伐鑹哄弬鏁�
+ */
@ApiModelProperty(value = "鏄惁鏈夊伐鑹哄弬鏁�")
- private java.lang.String processParametersFlag;
- /**鏄惁鏈夌簿搴﹀弬鏁�*/
+ private java.lang.String processParametersFlag;
+ /**
+ * 鏄惁鏈夌簿搴﹀弬鏁�
+ */
@ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�")
- private java.lang.String precisionParametersFlag;
- /**璁惧绔彛*/
+ private java.lang.String precisionParametersFlag;
+ /**
+ * 璁惧绔彛
+ */
@ApiModelProperty(value = "璁惧绔彛")
- private java.lang.String equipmentPort;
- /**鍧愭爣鏁伴噺*/
+ private java.lang.String equipmentPort;
+ /**
+ * 鍧愭爣鏁伴噺
+ */
@ApiModelProperty(value = "鍧愭爣鏁伴噺")
- private java.lang.Integer coordinateNum;
- /**澶囨敞*/
+ private java.lang.Integer coordinateNum;
+ /**
+ * 澶囨敞
+ */
@ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- @ApiModelProperty(value = "MDC璁惧绫诲瀷")
- private String deviceType;
+ private java.lang.String remark;
+ @ApiModelProperty(value = "MDC璁惧绫诲瀷")
+ private String deviceType;
- @TableField(exist = false)
- @ApiModelProperty(value = "缁翠慨鐘舵��")
- @Dict(dicCode = "equipment_repair_status")
- private String repairStatus;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "缁翠慨鐘舵��")
+ @Dict(dicCode = "equipment_repair_status")
+ private String repairStatus;
- @TableField(exist = false)
- @ApiModelProperty(value = "淇濆吇鐘舵��")
- @Dict(dicCode = "equipment_maintenance_status")
- private String maintenanceStatus;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "淇濆吇鐘舵��")
+ @Dict(dicCode = "equipment_maintenance_status")
+ private String maintenanceStatus;
+
+ @TableField(exist = false)
+ private String value;
+ @TableField(exist = false)
+ private String text;
+
+ public String getValue() {
+ return this.id;
+ }
+
+ public String getText() {
+ return this.equipmentCode + "[" + this.equipmentName + "]";
+ }
}
--
Gitblit v1.9.3