From 8f98ff2e202e5d7a39be484753db63d0165d70d7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 15:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao

---
 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 2d6cdab..9abb583 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -44,6 +44,9 @@
             <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
                 AND  pl.entry_date &lt;= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
             </if>
+            <if test="c.recorderId != null and c.recorderId != '' ">
+                AND  pl.recorder_id = #{c.recorderId}
+            </if>
         </where>
         group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
         pl.project_name,pl.entry_date,
@@ -51,4 +54,23 @@
         pl.contract_amount
 
     </select>
+    <select id="getPaymentRegistrationDtoById" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
+        SELECT
+            T1.id,
+            T1.payment_date,
+            T2.supplier_name,
+            T1.current_payment_amount,
+            T1.payment_method,
+            T3.nick_name AS registrant,
+            T1.registrationt_date
+        FROM
+            payment_registration T1
+                LEFT JOIN
+            supplier_manage T2 ON T1.supplier_id = T2.id
+                LEFT JOIN
+            sys_user T3 ON T3.user_id = T1.registrant_id
+        left join ticket_registration T4 on T1.ticket_registration_id = T4.id
+        WHERE
+            T4.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3