From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展
---
src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
index 01906d6..68e019f 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -26,7 +26,7 @@
@Excel(name = "璁惧绫诲瀷",sort = 0,combo = {"鐢熶骇璁惧","鍔炲叕璁惧","妫�鏌ヨ澶�","杩愯緭璁惧","鍏朵粬璁惧"})
private String type;
- @ApiModelProperty("璁″垝杩愯鏃堕棿")
+ @Schema(description = "璁″垝杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "璁″垝杩愯鏃堕棿",sort = 10,dateFormat = "yyyy-MM-dd")
@@ -84,10 +84,42 @@
/**
* 褰曞叆浜�
*/
- @Excel(name = "褰曞叆浜�",sort = 9)
+ @Excel(name = "褰曞叆浜�",sort = 10)
private String createUser;
+ @Excel(name = "璁惧缂栧彿", sort = 11)
+ private String uniqueCode;
+ @Excel(name = "鍑哄巶缂栧彿", sort = 12)
+ private String factoryNumber;
+ @Excel(name = "鍒堕�犲巶鍟�", sort = 13)
+ private String manufacturer;
+ @Excel(name = "璧勪骇鍘熷��", sort = 14)
+ private BigDecimal originalAssetValue;
+
+ @Excel(name = "璐疆鏃ユ湡", sort = 15, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date purchaseDate;
+
+ @Excel(name = "鍚敤鏃ユ湡", sort = 16, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date activationDate;
+
+ @Excel(name = "涓昏鎶�鏈弬鏁�", sort = 17)
+ private String technicalParameters;
+
+ @Excel(name = "涓昏鐢ㄩ��", sort = 18)
+ private String mainPurpose;
+
+ @Excel(name = "璐ｄ换浜�", sort = 19)
+ private String responsiblePerson;
+
+ @Excel(name = "寤烘。鏃ユ湡", sort = 20, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date filingDate;
}
--
Gitblit v1.9.3