From db1d7484b7114f9f91decef684280866dac34dfe Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期日, 29 十月 2023 23:30:09 +0800
Subject: [PATCH] 消息加台账导入

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java |   66 +++++++++++++--------------------
 1 files changed, 26 insertions(+), 40 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 cbe80f0..6cdce5b 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
@@ -14,37 +14,49 @@
 @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 = "浣跨敤閮ㄩ棬",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
     private String useId;
 
-    @Excel(name = "宸ュ尯")
-    private String equipmentUda1;
+//    @Excel(name = "宸ュ尯",dicCode = "id",dictTable = "mom_base_area",dicText = "name")
+    private String factoryModelId;
 
-    @Excel(name = "缁存姢閮ㄩ棬",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
+//    @Excel(name = "缁存姢閮ㄩ棬",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
     private String manageId;
 
-    @Excel(name = "缁翠慨鐝粍",dictTable = "mom_base_team",dicCode = "id",dicText = "name")
+//    @Excel(name = "缁翠慨鐝粍",dictTable = "mom_base_team",dicCode = "id"2,dicText = "name")
     private String teamId;
 
-    @Excel(name = "ABC鏍囪瘑",dicCode = "id",dictTable="mom_eam_equipment_importance",dicText="name")
+//    @Excel(name = "璧勪骇鍒堕�犲晢",dicCode = "id",dictTable="mom_base_constructor",dicText="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 = "鐏伀鍣�")
@@ -52,9 +64,6 @@
 
     @Excel(name = "鐏伀鍣ㄦ湁鏁堟湡")
     private String fireExtinguisherValidityPeriod;
-
-    @Excel(name = "鎿嶄綔绯荤粺")
-    private String operatingSystem;
 
     @Excel(name = "绯荤粺")
     private String system;
@@ -64,9 +73,6 @@
 
     @Excel(name = "鍧愭爣鏁伴噺")
     private BigDecimal coordinateNum;
-
-    @Excel(name = "璁惧鐘舵��",dicCode = "equipment_status")
-    private String equipmentStatus;
 
     @Excel(name = "閲嶉噺")
     private String equipmentUda3;
@@ -95,14 +101,11 @@
     @Excel(name = "鍑哄巶缂栧彿")
     private String factoryNumber;
 
-    @Excel(name = "璧勪骇鍒堕�犲晢",dicCode = "id",dictTable="mom_base_constructor",dicText="name")
-    private String constructorId;
-
     @Excel(name = "璧勪骇鐨勬潵婧愬浗瀹�")
     private String sourceCountry;
 
-    @Excel(name = "鍨嬪彿")
-    private String model;
+    @Excel(name = "瀹夊叏閰嶇疆")
+    private String securityConfiguration;
 
     @Excel(name = "瑙勬牸")
     private String specification;
@@ -110,31 +113,14 @@
     @Excel(name = "鎬诲姛鐜�")
     private String gpo;
 
-    @Excel(name = "鎶�鏈姸鎬�",dicCode = "technology_status")
-    private String technologyStatus;
-
-    @Excel(dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name", name = "杞﹂棿")
-    private String factoryModelId;
-
-    @Excel(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "浜х嚎")
-    private String workCenterId;
-
     @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�",format = "yyyyMMdd")
     private Date warrantyStart;
 
     @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡",format = "yyyyMMdd")
     private Date warrantyEnd;
 
-    @Excel(dicCode = "property_status",name = "璧勪骇鐘舵��")
-    private String 	propertyStatus;
-
     @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyyMMdd")
     private Date  nextTechnologyStatusQualificationTime;
-
-
-
-
-
 
 
 }

--
Gitblit v1.9.3