From 390b4243dff25a50f1d3302228e7dd16e9c2f18a Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 14 五月 2025 17:56:24 +0800
Subject: [PATCH] 1.合同金额优化 2.来票台账
---
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 8490cba..7ff62bf 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.ReceiptPaymentMapper">
- <select id="invoiceLedgerPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
+ <select id="receiptPaymentListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
SELECT
T1.id ,
T1.sales_ledger_id ,
@@ -20,9 +20,47 @@
T1.create_user ,
T1.update_time ,
T1.update_user ,
- T1.tenant_id ,
+ T1.tenant_id,
+ T3.customer_contract_no,
+ T2.customer_name
FROM receipt_payment T1
LEFT JOIN customer T2 ON T1.customer_id = T2.id
+ LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
+ <where>
+ <if test="receiptPaymentDto.searchText != null and receiptPaymentDto.searchText != ''">
+ AND (
+ T2.customer_name LIKE CONCAT('%',#{receiptPaymentDto.searchText},'%')
+ OR T1.sales_contract_no LIKE CONCAT('%',#{receiptPaymentDto.searchText},'%')
+ )
+ </if>
+ </where>
+ </select>
+
+ <select id="receiptPaymentInfo" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
+ SELECT
+ T1.id ,
+ T1.sales_ledger_id ,
+ T1.sales_contract_no ,
+ T1.customer_id ,
+ T1.invoice_no ,
+ T1.invoice_amount ,
+ T1.tax_rate ,
+ T1.receipt_payment_type ,
+ T1.receipt_payment_amount ,
+ T1.registrant ,
+ T1.receipt_payment_date ,
+ T1.create_time ,
+ T1.create_user ,
+ T1.update_time ,
+ T1.update_user ,
+ T1.tenant_id,
+ T1.invoice_ledger_id,
+ T3.customer_contract_no,
+ T2.customer_name
+ FROM receipt_payment T1
+ LEFT JOIN customer T2 ON T1.customer_id = T2.id
+ LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
+ WHERE T1.id = #{id}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3