From ed0f5aafb57137002c9b88dcef396ec5ee7f3a04 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 13:39:40 +0800
Subject: [PATCH] yys 1.回款登记台账页面，增加一个开票日期列 2.销售台账，在合同金额后面，增加已开票金额、待开票金额、已回款金额、待回款金额
---
src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
index 9a86ebd..23fe6b4 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
@@ -1,9 +1,73 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.vo.FileVo;
+import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.InvoiceLedgerFile;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
@Data
public class InvoiceRegistrationProductDto extends InvoiceRegistrationProduct {
+ @ApiModelProperty(name = "瀹㈡埛鍚堝悓鍙�")
+ private String customerContractNo;
+
+ @ApiModelProperty(name = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @ApiModelProperty(name = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @ApiModelProperty(name = "闄勪欢")
+ private List<FileVo> fileList;
+
+ @ApiModelProperty(value = "鍙戠エ鍙�")
+ private String invoiceNo;
+
+ @ApiModelProperty(value = "鍙戠エ閲戦")
+ private BigDecimal invoiceTotal;
+
+ @ApiModelProperty(value = "寮�绁ㄤ汉")
+ private String invoicePerson;
+
+ @ApiModelProperty(value = "寮�绁ㄦ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate invoiceDate;
+
+ @TableField(exist = false)
+ private String invoiceDateStart;
+ @TableField(exist = false)
+ private String invoiceDateEnd;
+
+ @ApiModelProperty(value = "寮�绁ㄥ彴璐d")
+ private Integer invoiceLedgerId;
+
+ @ApiModelProperty(value = "鍙戠エ鏂囦欢鍚�")
+ private String invoiceFileName;
+
+ private List<InvoiceLedgerFile> commonFiles;
+
+ private String searchText;
+
+ private Boolean status;
+
+ private String projectName;
+
+
+ @TableField(exist = false)
+ private String createTimeStart;
+ @TableField(exist = false)
+ private String createTimeEnd;
+
+
}
--
Gitblit v1.9.3