From 2bdf6b86c427cd8a0f433d6a559d532eed67b733 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 13 八月 2026 13:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信
---
src/main/java/com/ruoyi/purchase/dto/VatDto.java | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/VatDto.java b/src/main/java/com/ruoyi/purchase/dto/VatDto.java
index 3564183..62ceff2 100644
--- a/src/main/java/com/ruoyi/purchase/dto/VatDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/VatDto.java
@@ -1,19 +1,59 @@
package com.ruoyi.purchase.dto;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
+
@Data
-@Schema(name = "VatDto", description = "绠＄悊椹鹃┒鑸�--澧炲�肩◣姣斿鍙傛暟")
+@Schema(name = "VatDto", description = "澧炲�肩◣姣斿鏄庣粏")
@ExcelIgnoreUnannotated
public class VatDto {
+ @Excel(name = "ID")
+ @Schema(description = "鍙戠エID")
+ private Long id;
+
+ @Excel(name = "鍙戠エ鍙风爜")
+ @Schema(description = "鍙戠エ鍙风爜")
+ private String invoiceNumber;
+
+ @Excel(name = "寮�绁ㄦ棩鏈�")
+ @Schema(description = "寮�绁ㄦ棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate issueDate;
+
+ @Excel(name = "绫诲瀷")
+ @Schema(description = "绫诲瀷 sales-閿�椤� purchase-杩涢」")
+ private String type;
+
+ @Excel(name = "鍙戠エ绫诲瀷")
+ @Schema(description = "鍙戠エ绫诲瀷")
+ private String invoiceType;
+
+ @Excel(name = "绋庨")
+ @Schema(description = "绋庨")
+ private BigDecimal taxAmount;
+
+ @Excel(name = "浠风◣鍚堣")
+ @Schema(description = "浠风◣鍚堣")
+ private BigDecimal totalAmount;
+
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
@Excel(name = "鏈堜唤")
@Schema(description = "鏈堜唤")
- private String month ;
+ private String month;
@Excel(name = "閿�椤圭◣棰�")
@Schema(description = "閿�椤圭◣棰�")
@@ -23,8 +63,27 @@
@Schema(description = "杩涢」绋庨")
private BigDecimal xTaxAmount;
- @Excel(name = "閿�-杩�")
- @Schema(description = "閿�-杩�")
- private BigDecimal taxAmount;
+ // ========== 鏄庣粏瑙嗗浘瀛楁 ==========
+
+ @Excel(name = "鍙戠エ鍙�")
+ @Schema(description = "鍙戠エ鍙�")
+ private String invoiceNo;
+
+ @Excel(name = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @Excel(name = "璁㈠崟绫诲瀷")
+ @Schema(description = "绫诲瀷 杩涢」/閿�椤�")
+ private String orderType;
+
+ @Excel(name = "寮�绁ㄦ棩鏈�")
+ @Schema(description = "寮�绁ㄦ棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate invoiceDate;
+
+ @Excel(name = "绋庣巼")
+ @Schema(description = "绋庣巼")
+ private BigDecimal taxRate;
}
--
Gitblit v1.9.3