From e6c576bb57aa314e62154bbfc852012280d15aff Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 11:47:55 +0800
Subject: [PATCH] fix(device): 设备台账导入模板与导出格式统一为模板字段
---
src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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..4efcb5b 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,10 +26,10 @@
@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")
+ @Excel(name = "璁″垝杩愯鏃堕棿",sort = 9,dateFormat = "yyyy-MM-dd")
private Date planRuntimeTime;
/**
@@ -51,40 +51,43 @@
private String unit;
/**
- * 鏁伴噺
+ * 鏁伴噺锛堜笉鍦ㄥ鍏ユā鏉�/瀵煎嚭涓睍绀猴紝瀵煎叆鏃舵寜 1 鍙板鐞嗭級
*/
- @Excel(name = "鏁伴噺",sort = 5, type = Excel.Type.EXPORT)
private BigDecimal number = BigDecimal.ONE;
/**
* 鍚◣鍗曚环
*/
- @Excel(name = "鍚◣鍗曚环",sort = 6)
+ @Excel(name = "鍚◣鍗曚环",sort = 5)
private BigDecimal taxIncludingPriceUnit;
/**
- * 鍚◣鎬讳环
+ * 鍚◣鎬讳环锛堜笉鍦ㄥ鍏ユā鏉�/瀵煎嚭涓睍绀猴紝瀵煎叆鏃舵寜 鍚◣鍗曚环 脳 鏁伴噺 璁＄畻锛�
*/
- @Excel(name = "鍚◣鎬讳环",sort = 7, type = Excel.Type.EXPORT)
private BigDecimal taxIncludingPriceTotal;
/**
* 绋庣巼
*/
- @Excel(name = "绋庣巼",sort = 8)
+ @Excel(name = "绋庣巼",sort = 6)
private BigDecimal taxRate;
/**
- * 涓嶅惈绋庢�讳环
+ * 涓嶅惈绋庢�讳环锛堜笉鍦ㄥ鍏ユā鏉�/瀵煎嚭涓睍绀猴紝鎸夌◣鐜囨姌绠楋級
*/
- @Excel(name = "涓嶅惈绋庢�讳环",sort = 9, type = Excel.Type.EXPORT)
private BigDecimal unTaxIncludingPriceTotal;
/**
+ * 鏄惁鍚敤 1-鍚敤 0-鍋滅敤
+ */
+ @Excel(name = "鍚敤鐘舵��", sort = 7, readConverterExp = "1=鍚敤,0=鍋滅敤")
+ private Integer isEnabled;
+
+ /**
* 褰曞叆浜�
*/
- @Excel(name = "褰曞叆浜�",sort = 9)
+ @Excel(name = "褰曞叆浜�",sort = 8)
private String createUser;
--
Gitblit v1.9.3