From 5deaede4715d2703aadcd33f94256b339b9e9140 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 14 四月 2026 10:09:08 +0800
Subject: [PATCH] feat(sales): 添加发票和销售台账查询过滤功能
---
src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java | 97 +++++++++++++++---------------------------------
1 files changed, 30 insertions(+), 67 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..b26c193 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
@@ -7,87 +7,50 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.util.Date;
@Data
public class DeviceLedgerExeclDto {
+ @Excel(name = "璁惧绫诲瀷", sort = 0, combo = {"鐢熶骇璁惧", "鍔炲叕璁惧", "妫�娴嬭澶�", "杩愯緭璁惧", "鍏朵粬璁惧"})
+ private String type;
- /**
- * 璁惧鍚嶇О
- */
- @Excel(name = "璁惧鍚嶇О" ,sort = 1)
+ @Excel(name = "璁惧鍚嶇О", sort = 1)
private String deviceName;
- /**
- * 璁惧绫诲瀷
- */
- @Excel(name = "璁惧绫诲瀷",sort = 0,combo = {"鐢熶骇璁惧","鍔炲叕璁惧","妫�鏌ヨ澶�","杩愯緭璁惧","鍏朵粬璁惧"})
- private String type;
+ @Excel(name = "瑙勬牸鍨嬪彿", sort = 2)
+ private String deviceModel;
+
+ @Excel(name = "渚涘簲鍟嗗悕绉�", sort = 3)
+ private String supplierName;
+
+ @Excel(name = "鍗曚綅", sort = 4)
+ private String unit;
+
+ @Excel(name = "鏁伴噺", sort = 5, type = Excel.Type.EXPORT)
+ private BigDecimal number = BigDecimal.ONE;
+
+ @Excel(name = "鍚◣鍗曚环", sort = 6)
+ private BigDecimal taxIncludingPriceUnit;
+
+ @Excel(name = "鍚◣鎬讳环", sort = 7, type = Excel.Type.EXPORT)
+ private BigDecimal taxIncludingPriceTotal;
+
+ @Excel(name = "绋庣巼", sort = 8)
+ private BigDecimal taxRate;
+
+ @Excel(name = "涓嶅惈绋庢�讳环", sort = 9, type = Excel.Type.EXPORT)
+ private BigDecimal unTaxIncludingPriceTotal;
@ApiModelProperty("璁″垝杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁″垝杩愯鏃堕棿",sort = 10,dateFormat = "yyyy-MM-dd")
+ @Excel(name = "璁″垝杩愯鏃堕棿", sort = 10, dateFormat = "yyyy-MM-dd")
private Date planRuntimeTime;
- /**
- * 瑙勬牸鍨嬪彿
- */
- @Excel(name = "瑙勬牸鍨嬪彿" ,sort = 2)
- private String deviceModel;
+ @Excel(name = "璁惧鍖哄煙", sort = 11)
+ private String areaName;
- /**
- * 渚涘簲鍟嗗悕绉�
- */
- @Excel(name = "渚涘簲鍟嗗悕绉�",sort = 3)
- private String supplierName;
-
- /**
- * 鍗曚綅
- */
- @Excel(name = "鍗曚綅",sort = 4)
- private String unit;
-
- /**
- * 鏁伴噺
- */
- @Excel(name = "鏁伴噺",sort = 5, type = Excel.Type.EXPORT)
- private BigDecimal number = BigDecimal.ONE;
-
- /**
- * 鍚◣鍗曚环
- */
- @Excel(name = "鍚◣鍗曚环",sort = 6)
- private BigDecimal taxIncludingPriceUnit;
-
- /**
- * 鍚◣鎬讳环
- */
- @Excel(name = "鍚◣鎬讳环",sort = 7, type = Excel.Type.EXPORT)
- private BigDecimal taxIncludingPriceTotal;
-
- /**
- * 绋庣巼
- */
- @Excel(name = "绋庣巼",sort = 8)
- private BigDecimal taxRate;
-
- /**
- * 涓嶅惈绋庢�讳环
- */
- @Excel(name = "涓嶅惈绋庢�讳环",sort = 9, type = Excel.Type.EXPORT)
- private BigDecimal unTaxIncludingPriceTotal;
-
-
- /**
- * 褰曞叆浜�
- */
- @Excel(name = "褰曞叆浜�",sort = 9)
+ @Excel(name = "褰曞叆浜�", sort = 12)
private String createUser;
-
-
-
-
}
--
Gitblit v1.9.3