From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java |   86 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 9462b98..fb2004a 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -1,19 +1,97 @@
 package com.ruoyi.sales.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.ReceiptPayment;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
 
 @Data
 public class ReceiptPaymentDto extends ReceiptPayment {
 
-    @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+    @Schema(description = "瀹㈡埛鍚堝悓鍙�")
+    @Excel(name = "瀹㈡埛鍚堝悓鍙�")
     private String customerContractNo;
 
-    @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+    @Schema(description = "鐘舵��")
+    @Excel(name = "鐘舵��")
+    private String statusName;
+
+
+    @Schema(description = "瀹㈡埛鍚嶇О")
+    @Excel(name = "瀹㈡埛鍚嶇О")
     private String customerName;
 
-    @ApiModelProperty(value = "鏌ヨ鏂囨湰")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "寮�绁ㄦ棩鏈�",width = 30,dateFormat = "yyyy-MM-dd")
+    @Schema(description = "寮�绁ㄦ棩鏈�")
+    private Date invoiceDate;
+
+    @TableField(exist = false)
+    private String invoiceDateStart;
+    @TableField(exist = false)
+    private String invoiceDateEnd;
+
+    @Schema(description = "鏌ヨ鏂囨湰")
     private String searchText;
 
+    @Schema(description = "閿�鍞彴璐ales_ledger")
+    @Excel(isExport = false)
+    private Long salesLedgerId;
+
+    @Schema(description = "閿�鍞悎鍚屽彿")
+    @Excel(name = "閿�鍞悎鍚屽彿")
+    private String salesContractNo;
+
+    @Schema(description = "瀹㈡埛鍚嶇ОID")
+    @Excel(isExport = false)
+    private Integer customerId;
+
+    @Schema(description = "鍙戠エ鍙�")
+    @Excel(name = "鍙戠エ鍙�")
+    private String invoiceNo;
+
+    @Schema(description = "鍙戠エ閲戦")
+    @Excel(name = "鍙戠エ閲戦")
+    private BigDecimal invoiceTotal;
+
+    @Schema(description = "绋庣巼锛�%锛�")
+    @Excel(name = "绋庣巼锛�%锛�")
+    private BigDecimal taxRate;
+
+    @Schema(description = "浜у搧澶х被")
+    @Excel(name = "浜у搧澶х被")
+    private String productCategory;
+
+    @Schema(description = "鍥炴閲戦")
+    @Excel(name = "鍥炴閲戦")
+    private BigDecimal receiptPaymentAmountTotal;
+
+    @Schema(description = "寰呭洖娆鹃噾棰�")
+    @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;
+
+    @Schema(description = "椤圭洰鍚嶇О")
+    @Excel(name = "椤圭洰鍚嶇О")
+    private String projectName;
+
+
 }

--
Gitblit v1.9.3