From fc76b6c4a7ccd2d875b0fb998a868fe4bea188f7 Mon Sep 17 00:00:00 2001
From: 朱桂飞 <zhuguifei@zhuguifeideMacBook-Air.local>
Date: 星期五, 14 二月 2025 09:19:18 +0800
Subject: [PATCH] 新增设备台账导入
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java | 233 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 150 insertions(+), 83 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java
index 5ba8cbb..36a3d0a 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java
@@ -1,9 +1,12 @@
package org.dromara.eims.domain.vo;
import java.util.Date;
+
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.eims.domain.EimsEqu;
@@ -25,7 +28,7 @@
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = EimsEqu.class)
-public class EimsEquVo implements Serializable {
+public class EimsEquVo extends BaseEntity implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@@ -33,12 +36,124 @@
/**
*
*/
- @ExcelProperty(value = "")
private Long equId;
+
+ /**
+ * 璁惧鍚嶇О
+ */
+ @ExcelProperty(value = "璁惧鍚嶇О")
+ private String equName;
+
+ /**
+ * 瑙勬牸鍨嬪彿
+ */
+ @ExcelProperty(value = "瑙勬牸鍨嬪彿")
+ private String modelNo;
+
+ /**
+ * 鍒堕�犲巶瀹�
+ */
+ @ExcelProperty(value = "鍒堕�犲巶瀹�")
+ private String madeIn;
+
+
+ /**
+ * 閿�鍞晢
+ */
+ @ExcelProperty(value = "閿�鍞晢")
+ private String seller;
+
+ /**
+ * 鍗曚綅
+ */
+ @ExcelProperty(value = "鍗曚綅")
+ private String unit;
+
+ /**
+ * 璧勪骇缂栧彿
+ */
+ @ExcelProperty(value = "璧勪骇缂栧彿")
+ private String assetNo;
+
+ /**
+ * 鎵�鍦ㄥ満鎵�
+ */
+ @ExcelProperty(value = "鎵�鍦ㄥ満鎵�")
+ private String location;
+
+ /**
+ * 绠＄悊鑰�
+ */
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "respPerson")
+ @ExcelProperty(value = "绠＄悊鑰�")
+ private String respPersonName;
+
+ /**
+ * 璐拱鏃ユ湡
+ */
+ @ExcelProperty(value = "璐拱鏃ユ湡")
+ @ColumnWidth(24)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date purchaseDate;
+
+ /**
+ * 瀹為檯楠屾敹鏃ユ湡
+ */
+ @ExcelProperty(value = "楠屾敹鏃ユ湡")
+ @ColumnWidth(24)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date actualAcceptDate;
+
+ /**
+ * 缁忔墜浜�
+ */
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "handleUser")
+ @ExcelProperty(value = "缁忔墜浜�")
+ private String handleUserName;
+
+ /**
+ * 閲囪喘浜�
+ */
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "purchaseUser")
+ @ExcelProperty(value = "閲囪喘浜�")
+ private String purchaseUserName;
+
+ /**
+ * 棰濆畾鍔熺巼
+ */
+ @ExcelProperty(value = "鍔熺巼")
+ private String ratedPower;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ @ExcelProperty(value = "鑱旂郴鐢佃瘽")
+ private String contactPhone;
+
+ /**
+ * 浣跨敤鐘舵��
+ */
+ @ExcelProperty(value = "浣跨敤鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_equ_status")
+ private String status;
+
+ /**
+ * 澶囨敞
+ */
+ @ExcelProperty(value = "澶囨敞")
+ private String remark;
+
+ /**
+ * 闄勪欢
+ */
+ @ExcelProperty(value = "闄勪欢")
+ private String attachments;
+
+
/**
* 璁惧缂栫爜
*/
- @ExcelProperty(value = "璁惧缂栫爜")
+ //@ExcelProperty(value = "璁惧缂栫爜")
private String equCode;
@@ -50,71 +165,21 @@
/**
* 璁惧绫诲瀷鍚嶇О
*/
- @ExcelProperty(value = "璁惧绫诲瀷")
+ //@ExcelProperty(value = "璁惧绫诲瀷")
@Translation(type = TransConstant.EQU_YPE_ID_TO_NAME, mapper = "equTypeId")
private String equTypeName;
- /**
- * 璧勪骇缂栧彿
- */
- @ExcelProperty(value = "璧勪骇缂栧彿")
- private String assetNo;
-
- /**
- * 璁惧鍚嶇О
-
- */
- @ExcelProperty(value = "璁惧鍚嶇О")
- private String equName;
-
- /**
- * 鍨嬪彿
- */
- @ExcelProperty(value = "鍨嬪彿")
- private String modelNo;
-
- /**
- * 鍒堕�犲晢
- */
- @ExcelProperty(value = "鍒堕�犲晢")
- private String madeIn;
-
- /**
- * 棰濆害鍔熺巼
- */
- @ExcelProperty(value = "棰濆害鍔熺巼")
- private String ratedPower;
/**
* 閾墝淇℃伅
*/
- @ExcelProperty(value = "閾墝淇℃伅")
+ //@ExcelProperty(value = "閾墝淇℃伅")
private String plateInfo;
-
- /**
- * 閲囪喘鏃ユ湡
- */
- @ExcelProperty(value = "閲囪喘鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date purchaseDate;
-
- /**
- * 鐘舵��
- */
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_equ_status")
- private String status;
-
- /**
- * 鎵�鍦ㄥ満鎵�
- */
- @ExcelProperty(value = "鎵�鍦ㄥ満鎵�")
- private String location;
/**
* 浣跨敤閮ㄩ棬锛堝叧鑱攊d锛�
*/
- @ExcelProperty(value = "浣跨敤閮ㄩ棬", converter = ExcelDictConvert.class)
+ //@ExcelProperty(value = "浣跨敤閮ㄩ棬", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "鍏�=鑱攊d")
private Long deptUsed;
/**
@@ -126,75 +191,77 @@
/**
* 璐ｄ换浜�(鍏宠仈id)
*/
- @ExcelProperty(value = "璐ｄ换浜�(鍏宠仈id)")
+ //@ExcelProperty(value = "璐ｄ换浜�(鍏宠仈id)")
private Long respPerson;
- /**
- * 閮ㄩ棬鍚�
- */
- @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "respPerson")
- private String respPersonName;
-
- /**
- * 鑱旂郴鐢佃瘽
- */
- @ExcelProperty(value = "鑱旂郴鐢佃瘽")
- private String contactPhone;
/**
* 姝ｅ紡浣跨敤鏃ユ湡
*/
- @ExcelProperty(value = "姝ｅ紡浣跨敤鏃ユ湡")
+ //@ExcelProperty(value = "姝ｅ紡浣跨敤鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date deployDate;
/**
* 寮�濮嬭瘯鐢ㄦ棩鏈�
*/
- @ExcelProperty(value = "寮�濮嬭瘯鐢ㄦ棩鏈�")
+ //@ExcelProperty(value = "寮�濮嬭瘯鐢ㄦ棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date trialDate;
/**
* 璁″垝楠屾敹鏃ユ湡
*/
- @ExcelProperty(value = "璁″垝楠屾敹鏃ユ湡")
+ //@ExcelProperty(value = "璁″垝楠屾敹鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planAcceptDate;
/**
- * 瀹為檯楠屾敹鏃ユ湡
- */
- @ExcelProperty(value = "瀹為檯楠屾敹鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date actualAcceptDate;
-
- /**
* 瀵煎叆鐘舵�侊紙瀛楀吀锛�
*/
- @ExcelProperty(value = "瀵煎叆鐘舵��", converter = ExcelDictConvert.class)
+ //@ExcelProperty(value = "瀵煎叆鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "瀛�=鍏�")
private String importStatus;
-
/**
* 鐩樼偣鏍囧織
*/
- @ExcelProperty(value = "鐩樼偣鏍囧織")
+ //@ExcelProperty(value = "鐩樼偣鏍囧織")
private String inventoryFlag;
/**
* 涓婃鐩樼偣鏃ユ湡
*/
- @ExcelProperty(value = "涓婃鐩樼偣鏃ユ湡")
+ //@ExcelProperty(value = "涓婃鐩樼偣鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date inventoryDate;
/**
* 浣跨敤骞撮檺
*/
- @ExcelProperty(value = "浣跨敤骞撮檺")
+ //@ExcelProperty(value = "浣跨敤骞撮檺")
private Long serviceLife;
+ /**
+ * 缁忔墜浜�
+ */
+ //@ExcelProperty(value = "缁忔墜浜�")
+ private Long handleUser;
+
+ /**
+ * 閲囪喘浜�
+ */
+ //@ExcelProperty(value = "閲囪喘浜�")
+ private Long purchaseUser;
+
+ /**
+ * 璧勬枡
+ */
+ @ExcelProperty(value = "璧勬枡")
+ private String profile;
+
+
+
+
}
--
Gitblit v1.9.3