From 79a570ae5f497e30337e7dd002450072e1b21cc2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 16 一月 2026 16:19:47 +0800
Subject: [PATCH] fix: 处理空值计算,确保待来票金额与未来票金额一致

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

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 2d6cdab..c660e2c 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -17,8 +17,8 @@
         pl.supplier_name,
         pl.project_name,
         pl.contract_amount,
-        sum(pr.tickets_amount)as receipt_payment_amount,
-        pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
+        COALESCE(SUM(pr.tickets_amount), 0) AS receipt_payment_amount,
+        pl.contract_amount - COALESCE(SUM(pr.tickets_amount), 0) AS unReceipt_payment_amount,
         pl.entry_date,
         pl.recorder_name,
         pl.payment_method
@@ -51,4 +51,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