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/resources/mapper/sales/ReceiptPaymentMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 8c0fc74..0f2bc4c 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -99,7 +99,7 @@
AND T3.customer_name LIKE CONCAT('%',#{c.customerName},'%')
</if>
<if test="c.customerContractNo != null and c.customerContractNo !=''">
- AND T1.customer_contract_no LIKE CONCAT('%',#{c.customerContractNo},'%')
+ AND T3.customer_contract_no LIKE CONCAT('%',#{c.customerContractNo},'%')
</if>
<if test="c.projectName != null and c.projectName !=''">
AND T3.project_name LIKE CONCAT('%',#{c.projectName},'%')
@@ -210,10 +210,10 @@
AND T4.project_name LIKE CONCAT('%',#{params.projectName},'%')
</if>
<if test="params.customerContractNo != null and params.customerContractNo != '' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{params.customerContractNo},'%')
+ AND T4.customer_contract_no LIKE CONCAT('%',#{params.customerContractNo},'%')
</if>
<if test="params.salesContractNo != null and params.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{params.salesContractNo},'%')
+ AND T4.sales_contract_no LIKE CONCAT('%',#{params.salesContractNo},'%')
</if>
</where>
ORDER BY T1.receipt_payment_date DESC
@@ -368,7 +368,7 @@
BY invoice_ledger_id
) T6 ON T1.id = T6.invoice_ledger_id
</select>
- <select id="bindInvoiceNoRegListByIds" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
+ <select id="bindInvoiceNoRegListByIds" resultType="com.ruoyi.sales.dto.ReceiptPaymentExeclDto">
SELECT
T1.id ,
T1.invoice_no ,
--
Gitblit v1.9.3