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/pojo/PurchaseLedger.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index b88be60..5ee4125 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -34,7 +35,7 @@
/**
* 渚涘簲鍟嗗悕绉癷d
*/
- private String supplierId;
+ private Long supplierId;
/**
* 渚涘簲鍟嗗悕绉�
@@ -110,23 +111,31 @@
* 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
*/
private BigDecimal contractAmount;
-
- /**
- * 涓氬姟鍛�
- */
- @Excel(name = "涓氬姟鍛�")
- private String businessPerson;
-
- /**
- * 涓氬姟鍛榠d
- */
- private Long businessPersonId;
+//
+// /**
+// * 涓氬姟鍛�
+// */
+// @Excel(name = "涓氬姟鍛�")
+// private String businessPerson;
+//
+// /**
+// * 涓氬姟鍛榠d
+// */
+// private Long businessPersonId;
/**
* 涓氬姟鍛樻墜鏈哄彿
*/
private String phoneNumber;
+ @TableField(exist = false)
+ @ApiModelProperty("鏉ョエ閲戦")
+ private String receiptPaymentAmount;
+
+ @ApiModelProperty("鏈潵绁ㄩ噾棰�")
+ @TableField(exist = false)
+ private String unReceiptPaymentAmount;
+
}
--
Gitblit v1.9.3