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 | 97 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 28 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 882e779..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,10 +1,14 @@
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;
/**
* @author lnl
@@ -12,37 +16,55 @@
@Data
@Accessors(chain = true)
public class EquipmentImportVo {
+ @Excel(name = "璁惧鎵�灞炲垎绫�")
+ private String equipmentCategoryName;
+
@Excel(name="缁熶竴缂栫爜")
private String num;
@Excel(name = "璁惧鍚嶇О")
private String name;
- @Excel(name = "浣跨敤閮ㄩ棬",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
+ @Excel(name = "鍨嬪彿")
+ private String model;
+
+ @Excel(name = "浣跨敤閮ㄩ棬")
private String useId;
- @Excel(name = "宸ュ尯")
- private String equipmentUda1;
+ @Excel(name = "涓績")
+ private String workCenterId;
- @Excel(name = "缁存姢閮ㄩ棬",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
+ @Excel(name = "宸ュ尯")
+ private String factoryModelId;
+
+ @Excel(name = "宸ユ")
+ private String areaId;
+
+ @Excel(name = "缁存姢閮ㄩ棬")
private String manageId;
- @Excel(name = "缁翠慨鐝粍",dictTable = "mom_base_team",dicCode = "id",dicText = "name")
+ @Excel(name = "缁翠慨鐝粍")
private String teamId;
- @Excel(name = "ABC鏍囪瘑",dicCode = "id",dictTable="mom_eam_equipment_importance",dicText="name")
+ @Excel(name = "璧勪骇鍒堕�犲晢")
+ private String constructorId;
+
+ @Excel(name = "ABC鏍囪瘑",dicCode = "ABC-standard-result")
private String equipmentImportanceId;
- @Excel(name = "璁惧鎵�灞炲垎绫�")
- private String equipmentCategoryName;
+ @Excel(name = "璁惧鐘舵��",dicCode = "equipment_status")
+ private String equipmentStatus;
- @Excel(name = "鍏抽敭璁惧鏍囪瘑")
+ @Excel(name = "鎶�鏈姸鎬�",dicCode = "technology_status")
+ private String technologyStatus;
+
+ @Excel(name = "鍏抽敭璁惧鏍囪瘑",dicCode = "specific_equipment")
private String keyEquipmentIdentification;
- @Excel(name = "瀹夊叏閰嶇疆")
- private String securityConfiguration;
+ @Excel(name = "璧勪骇鐘舵��",dicCode = "property_status")
+ private String propertyStatus;
- @Excel(name = "鍐峰嵈绯荤粺")
+ @Excel(name = "鍐峰嵈绯荤粺",dicCode = "cooling_system")
private String coolingSystem;
@Excel(name = "鐏伀鍣�")
@@ -51,7 +73,7 @@
@Excel(name = "鐏伀鍣ㄦ湁鏁堟湡")
private String fireExtinguisherValidityPeriod;
- @Excel(name = "鎿嶄綔绯荤粺")
+ @Excel(name = "鎿嶄綔绯荤粺",dicCode = "operation_flag")
private String operatingSystem;
@Excel(name = "绯荤粺")
@@ -63,22 +85,19 @@
@Excel(name = "鍧愭爣鏁伴噺")
private BigDecimal coordinateNum;
- @Excel(name = "璁惧鐘舵��")
- private String equipmentStatus;
-
@Excel(name = "閲嶉噺")
private String equipmentUda3;
- @Excel(name = "閲嶉噺璁￠噺鍗曚綅",dicCode = "id",dicText = "name",dictTable = "mom_base_unit")
+ @Excel(name = "閲嶉噺璁￠噺鍗曚綅")
private String equipmentUda4;
@Excel(name = "鍔熻兘浣嶇疆")
private String equipmentUda5;
@Excel(name = "瀹夎浣嶇疆")
- private String equipmentUda2;
+ private String location;
- @Excel(name = "鍑哄巶鏃ユ湡",importFormat = "yyyyMMdd")
+ @Excel(name = "鍑哄巶鏃ユ湡")
private String leaveFactoryDate;
@Excel(name = "绔嬮」鍗″彿")
@@ -87,29 +106,51 @@
@Excel(name = "璧勯噾鏉ユ簮")
private String fundSource;
- @Excel(name = "楠屾敹鏃ユ湡",importFormat = "yyyyMMdd")
+ @Excel(name = "楠屾敹鏃ユ湡")
private String acceptanceCheckDate;
@Excel(name = "鍑哄巶缂栧彿")
- private String factoryNo;
+ private String factoryNumber;
- @Excel(name = "璧勪骇鍒堕�犲晢",dicCode = "id",dictTable="mom_base_constructor",dicText="name")
- private String constructorId;
-
- @Excel(name = "璧勪骇鐨勬潵婧愬浗瀹�")
+ @Excel(name = "璧勪骇鏉ユ簮鍥藉")
private String sourceCountry;
- @Excel(name = "鍨嬪彿")
- private String model;
+ @Excel(name = "瀹夊叏閰嶇疆")
+ private String securityConfiguration;
- @Excel(name = "瑙勬牸")
+ @Excel(name = "璁惧瑙勬牸")
private String specification;
@Excel(name = "鎬诲姛鐜�")
private String gpo;
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�",format = "yyyy-MM-dd")
+ private java.util.Date warrantyStart;
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡",format = "yyyy-MM-dd")
+ private java.util.Date warrantyEnd;
+ @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