From c54f243c9a13ce53e7dc3f7823f585466eab0bd1 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 01 十二月 2025 09:53:28 +0800
Subject: [PATCH] yys 替换ip
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 02bc251..44877b3 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -14,12 +16,23 @@
@Data
public class PurchaseLedgerDto {
+
+ private String entryDateStart;
+ private String entryDateEnd;
+
+ /**
+ * 鏄惁寮�绁� 1-鏄� 2-鍚�
+ */
+ private Integer isInvoice;
+
private Long id;
/**
* 閲囪喘鍚堝悓鍙�
*/
+ @Excel(name = "閲囪喘鍚堝悓鍙�")
private String purchaseContractNumber;
+
/**
@@ -30,6 +43,7 @@
/**
* 渚涘簲鍟嗗悕绉�
*/
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
/**
@@ -41,11 +55,13 @@
/**
* 褰曞叆浜哄鍚�
*/
+ @Excel(name = "褰曞叆浜哄鍚�")
private String recorderName;
/**
* 閿�鍞悎鍚屽彿
*/
+ @Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
/**
@@ -56,13 +72,23 @@
/**
* 椤圭洰鍚嶇О
*/
+ @Excel(name = "椤圭洰鍚嶇О")
private String projectName;
/**
* 褰曞叆鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
+
+ /**
+ * 绛捐鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date executionDate;
/**
* 澶囨敞
@@ -138,15 +164,18 @@
/**
* 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
*/
+ @Excel(name = "鍚堝悓閲戦")
private BigDecimal contractAmount = BigDecimal.ZERO;
@TableField(exist = false)
@ApiModelProperty("鏉ョエ閲戦")
+ @Excel(name = "宸叉潵绁ㄩ噾棰�(鍏�)")
private BigDecimal receiptPaymentAmount = BigDecimal.ZERO;
@ApiModelProperty("鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
+ @Excel(name = "鏈潵绁ㄩ噾棰�(鍏�)")
private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
@ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
--
Gitblit v1.9.3