From 5f7a3b51fbd1fdb6eadb5f715ecf3b79d4bca194 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 10:03:29 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 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 71c56e2..7cc660c 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -1,8 +1,11 @@
package com.ruoyi.purchase.dto;
+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 java.math.BigDecimal;
@@ -12,12 +15,18 @@
@Data
public class PurchaseLedgerDto {
+
+ private String entryDateStart;
+ private String entryDateEnd;
+
private Long id;
/**
* 閲囪喘鍚堝悓鍙�
*/
+ @Excel(name = "閲囪喘鍚堝悓鍙�")
private String purchaseContractNumber;
+
/**
@@ -28,6 +37,7 @@
/**
* 渚涘簲鍟嗗悕绉�
*/
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
/**
@@ -39,11 +49,13 @@
/**
* 褰曞叆浜哄鍚�
*/
+ @Excel(name = "褰曞叆浜哄鍚�")
private String recorderName;
/**
* 閿�鍞悎鍚屽彿
*/
+ @Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
/**
@@ -54,12 +66,14 @@
/**
* 椤圭洰鍚嶇О
*/
+ @Excel(name = "椤圭洰鍚嶇О")
private String projectName;
/**
* 褰曞叆鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
/**
@@ -133,5 +147,29 @@
*/
private Long ticketRegistrationId;
+ /**
+ * 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
+ */
+ @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")
+ @TableField(exist = false)
+ private Integer type;
+
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
}
--
Gitblit v1.9.3