From 1fcaf7919db7ec3350e9bf953c0d651d4d85fac2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 11:45:48 +0800
Subject: [PATCH] 2025-06-23 回款登记导出+分页查询条件问题修复+【采购管理】-【来票登记】，合同金额列后面增加已开票金额、待开票金额两列
---
src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java | 21 ++++++++++++++++++++-
1 files changed, 20 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..ddd681b 100644
--- a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
@@ -1,12 +1,21 @@
package com.ruoyi.purchase.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.purchase.pojo.TicketRegistration;
+import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.Data;
import java.util.List;
+/**
+ * 鏉ョエ鐧昏琛�
+ */
+
@Data
-public class TicketRegistrationDto {
+@TableName("ticket_registration")
+public class TicketRegistrationDto extends TicketRegistration {
/**
* 涓婚敭ID
@@ -52,4 +61,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