From fff5ef18854efe6a4eb03049a1ddcc16edb0087e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 04 六月 2025 14:18:59 +0800
Subject: [PATCH] 台账导入修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
index 5ac21d5..88e9535 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
@@ -1,9 +1,11 @@
package org.jeecg.modules.eam.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -29,8 +31,14 @@
@Excel(name = "浣跨敤閮ㄩ棬")
private String useId;
+ @Excel(name = "涓績")
+ private String workCenterId;
+
@Excel(name = "宸ュ尯")
private String factoryModelId;
+
+ @Excel(name = "宸ユ")
+ private String areaId;
@Excel(name = "缁存姢閮ㄩ棬")
private String manageId;
@@ -64,6 +72,9 @@
@Excel(name = "鐏伀鍣ㄦ湁鏁堟湡")
private String fireExtinguisherValidityPeriod;
+
+ @Excel(name = "鎿嶄綔绯荤粺",dicCode = "operation_flag")
+ private String operatingSystem;
@Excel(name = "绯荤粺")
private String system;
@@ -101,26 +112,45 @@
@Excel(name = "鍑哄巶缂栧彿")
private String factoryNumber;
- @Excel(name = "璧勪骇鐨勬潵婧愬浗瀹�")
+ @Excel(name = "璧勪骇鏉ユ簮鍥藉")
private String sourceCountry;
@Excel(name = "瀹夊叏閰嶇疆")
private String securityConfiguration;
- @Excel(name = "瑙勬牸")
+ @Excel(name = "璁惧瑙勬牸")
private String specification;
@Excel(name = "鎬诲姛鐜�")
private String gpo;
- @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�",format = "yyyyMMdd")
- private Date warrantyStart;
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�",format = "yyyy-MM-dd")
+ private java.util.Date warrantyStart;
- @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡",format = "yyyyMMdd")
- private Date warrantyEnd;
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡",format = "yyyy-MM-dd")
+ private java.util.Date warrantyEnd;
- @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyyMMdd")
- private Date nextTechnologyStatusQualificationTime;
+ @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+ private java.util.Date nextTechnologyStatusQualificationTime;
+ @Excel(name = "涓変繚鏃ユ湡", format = "yyyy-MM-dd")
+ private java.util.Date thirdMaintenanceTime;
+
+ @Excel(name = "鎶�鏈姸鎬侀壌瀹氭棩鏈�", format = "yyyy-MM-dd")
+ private java.util.Date technologyStatusQualificationTime;
+
+ @Excel(name = "鍒涘缓浜�", width = 15)
+ private java.lang.String createBy;
+
+ @Excel(name = "鍒涘缓鏃堕棿", width = 20, format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date createTime;
+
+ @Excel(name = "鏇存柊浜�", width = 15)
+ private java.lang.String updateBy;
+
+ @Excel(name = "鏇存柊鏃堕棿", width = 20, format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date updateTime;
}
--
Gitblit v1.9.3