From f29e2aae98bbb52672b67bff99556f3cf64d1bce Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 26 六月 2025 15:45:40 +0800
Subject: [PATCH] feat(eims): 优化设备管理功能和界面
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java | 180 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 139 insertions(+), 41 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java
index 86f6a85..0f2ebf2 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java
@@ -1,7 +1,12 @@
package org.dromara.eims.domain.vo;
+import java.math.BigDecimal;
import java.util.Date;
+
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.poi.hpsf.Decimal;
+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.EimsFixture;
@@ -27,7 +32,7 @@
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = EimsFixture.class)
-public class EimsFixtureVo implements Serializable {
+public class EimsFixtureVo extends BaseEntity implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@@ -35,20 +40,130 @@
/**
*
*/
- @ExcelProperty(value = "")
private Long id;
- /**
- * 娌诲叿缂栫爜
- */
- @ExcelProperty(value = "娌诲叿缂栫爜")
- private String fixtureCode;
+
/**
* 娌诲叿鍚嶇О
*/
- @ExcelProperty(value = "娌诲叿鍚嶇О")
+ @ExcelProperty(value = "宸ュ叿鍚嶇О")
+ @ColumnWidth(30)
private String fixtureName;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ExcelProperty(value = "鍨嬪彿")
+ @ColumnWidth(15)
+ private String modelNo;
+
+ /**
+ * 鍝佺墝
+ */
+ @ExcelProperty(value = "鍝佺墝")
+ @ColumnWidth(20)
+ private String brand;
+
+ /**
+ * 鏁伴噺
+ */
+ @ExcelProperty(value = "鏁伴噺")
+ @ColumnWidth(10)
+ private Integer amount;
+
+
+ /**
+ * 鍗曚綅
+ */
+ @ExcelProperty(value = "鍗曚綅", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "eims_fixture_unit")
+ @ColumnWidth(10)
+ private String unit;
+
+ /**
+ * 璧勪骇缂栧彿
+ */
+ @ExcelProperty(value = "璧勪骇缂栧彿")
+ @ColumnWidth(20)
+ private String assetNo;
+
+
+ /**
+ * 浣跨敤閮ㄩ棬
+ */
+ private Long useDept;
+
+ @ExcelProperty(value = "浣跨敤閮ㄩ棬")
+ @ColumnWidth(20)
+ @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "useDept")
+ private String useDeptName;
+
+ /**
+ * 绠＄悊浜�
+ */
+ private Long manageUser;
+
+ @ExcelProperty(value = "绠＄悊浜�")
+ @ColumnWidth(12)
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "manageUser")
+ private String manageUserName;
+
+ /**
+ * 閲囪喘鏃ユ湡
+ */
+ @ExcelProperty(value = "閲囪喘鏃ユ湡")
+ @ColumnWidth(24)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date purchaseDate;
+
+ /**
+ * 浣跨敤鏃ユ湡
+ */
+ @ExcelProperty(value = "浣跨敤鏃ユ湡")
+ @ColumnWidth(24)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date deployDate;
+
+
+ /**
+ * 绠℃帶闇�姹�
+ */
+ @ExcelProperty(value = "绠℃帶闇�姹�", converter = ExcelDictConvert.class)
+ @ColumnWidth(10)
+ @ExcelDictFormat(dictType = "eims_fixture_manage")
+ private String isManage;
+
+ /**
+ * 鐘舵�侊紙瀛楀吀锛�
+ */
+ @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ColumnWidth(10)
+ @ExcelDictFormat(dictType = "eims_fixture_status")
+ private String status;
+
+
+
+
+ /**
+ * 鍗曚环
+ */
+ @ExcelProperty(value = "鍗曚环")
+ @ColumnWidth(10)
+ private BigDecimal unitPrice;
+
+ /**
+ * 鍔熺巼
+ */
+ @ExcelProperty(value = "鍔熺巼")
+ @ColumnWidth(15)
+ private String power;
+
+
+ /**
+ * 娌诲叿缂栫爜
+ */
+ private String fixtureCode;
/**
@@ -59,14 +174,12 @@
/**
* 娌诲叿锛堝伐鍏凤級绫诲瀷
*/
- @ExcelProperty(value = "娌诲叿绫诲瀷")
@Translation(type = TransConstant.FIXTURE_TYPE_ID_TO_NAME, mapper = "fixtureType")
private String fixtureTypeName;
/**
* 娌诲叿鎻忚堪
*/
- @ExcelProperty(value = "娌诲叿鎻忚堪")
private String fixtureDesc;
/**
@@ -85,59 +198,36 @@
private Long borrowUser;
/**
+ * 鍊熺敤鐘舵��
+ */
+// @ExcelProperty(value = "鍊熺敤鐘舵��", converter = ExcelDictConvert.class)
+// @ExcelDictFormat(dictType = "fixture_borrow_status")
+ private String borrowStatus;
+
+ /**
* 鍊熺敤浜�
*/
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "borrowUser")
private String borrowUserName;
- /**
- * 鐘舵�侊紙瀛楀吀锛�
- */
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "eims_fixture_status")
- private String status;
- /**
- * 璧勪骇缂栧彿
- */
- @ExcelProperty(value = "璧勪骇缂栧彿")
- private String assetNo;
- /**
- * 鍨嬪彿
- */
- @ExcelProperty(value = "鍨嬪彿")
- private String modelNo;
/**
* 瑙勬牸
*/
- @ExcelProperty(value = "瑙勬牸")
private String specNo;
/**
* 鍒堕�犲晢
*/
- @ExcelProperty(value = "鍒堕�犲晢")
private String madeIn;
- /**
- * 閲囪喘鏃ユ湡
- */
- @ExcelProperty(value = "閲囪喘鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date purchaseDate;
- /**
- * 浣跨敤鏃ユ湡
- */
- @ExcelProperty(value = "浣跨敤鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date deployDate;
/**
* 浣跨敤骞撮檺
*/
- @ExcelProperty(value = "浣跨敤骞撮檺")
private Long serviceLife;
/**
@@ -146,5 +236,13 @@
@ExcelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 褰撳墠鍊熺敤璁板綍id
+ */
+ private Long curBorrowId;
+
+
+
+
}
--
Gitblit v1.9.3