From f9a3ac34d690aafc96757370e1f6f948ad98368d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 17:28:12 +0800
Subject: [PATCH] yys 1.回款登记台账页面，增加一个开票日期列 2.销售台账，在合同金额后面，增加已开票金额、待开票金额、已回款金额、待回款金额
---
src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
index 1bdd771..33de871 100644
--- a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
@@ -1,12 +1,24 @@
package com.ruoyi.purchase.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.purchase.pojo.TicketRegistration;
+import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
import java.util.List;
+/**
+ * 鏉ョエ鐧昏琛�
+ */
+
@Data
-public class TicketRegistrationDto {
+@TableName("ticket_registration")
+public class TicketRegistrationDto extends TicketRegistration {
/**
* 涓婚敭ID
@@ -38,6 +50,12 @@
*/
private String businessPerson;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate enterDate;
+
/**
* 涓氬姟鍛榠d
*/
@@ -52,4 +70,14 @@
private Long salesContractNoId;
private String supplierName;
+
+ private List<String> tempFileIds;
+ private List<CommonFile> CommonFiles;
+
+ private String fileName;
+
+ @TableField(exist = false)
+ private String createdAtStart;
+ @TableField(exist = false)
+ private String createdAtEnd;
}
--
Gitblit v1.9.3