From f02b5af51f2fcfaae5b04e4c12078ec0da578f7e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 14 七月 2025 13:03:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index f007228..3fed962 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -9,4 +9,49 @@
SET contract_amount = #{totalTaxInclusiveAmount}
WHERE id = #{id}
</update>
+ <select id="selectPurchaseLedgerListPage" resultType="com.ruoyi.purchase.dto.PurchaseLedgerDto">
+ select
+ pl.id,
+ pl.purchase_contract_number ,
+ pl.sales_contract_no,
+ 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,
+ pl.entry_date,
+ pl.recorder_name,
+ pl.payment_method
+ from purchase_ledger pl
+ left join product_record pr on pl.id = pr.purchase_ledger_id
+ <where>
+ <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
+ pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+ </if>
+ </where>
+ group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
+ pl.project_name,pl.entry_date,
+ pl.recorder_name,
+ 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