From 8e39f175ef26827d08904a65b10748e736eeca21 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 10:20:08 +0800
Subject: [PATCH] 2025-06-23 【销售台账】 增加客户合同号、销售合同号、项目名称模糊查询 增加客户名称、客户合同号、项目名称查询，不显示待回款为0，默认为打钩。 销售管理】-【回款流水】，增加合同号、项目名称列查询，增加客户名称、项目名称、合同号查询条件。 【销售管理】-【回款登记】，增加导出功能
---
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java | 72 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 68c7402..92a5a1b 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -1,19 +1,79 @@
package com.ruoyi.sales.dto;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.ReceiptPayment;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
@Data
public class ReceiptPaymentDto extends ReceiptPayment {
+ @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+ private String customerContractNo;
+
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @ApiModelProperty(value = "鏌ヨ鏂囨湰")
+ @Excel(isExport = false)
+ private String searchText;
+
+ @ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
+ @Excel(isExport = false)
+ private Integer salesLedgerId;
+
+ @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Excel(name = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
+ @Excel(isExport = false)
+ private Integer customerId;
+
+ @ApiModelProperty(value = "鍙戠エ鍙�")
+ @Excel(name = "鍙戠エ鍙�")
+ private String invoiceNo;
+
+ @ApiModelProperty(value = "鍙戠エ閲戦")
+ @Excel(name = "鍙戠エ閲戦")
+ private BigDecimal invoiceTotal;
+
+ @ApiModelProperty(value = "绋庣巼锛�%锛�")
+ @Excel(name = "绋庣巼锛�%锛�")
+ private BigDecimal taxRate;
+
+ @ApiModelProperty(value = "浜у搧澶х被")
+ @Excel(name = "浜у搧澶х被")
+ private String productCategory;
+
+ @ApiModelProperty(value = "鍥炴閲戦")
+ @Excel(name = "鍥炴閲戦")
+ private BigDecimal receiptPaymentAmountTotal;
+
+ @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ @Excel(name = "寰呭洖娆鹃噾棰�")
+ private BigDecimal noReceiptAmount;
+
+ @TableField(exist = false)
+ @Excel(isExport = false)
+ private Boolean status;
+
+ @TableField(exist = false)
+ @Excel(isExport = false)
+ private String receiptPaymentDateStart;
+ @TableField(exist = false)
+ @Excel(isExport = false)
+ private String receiptPaymentDateEnd;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
+
+
}
--
Gitblit v1.9.3