From 3ac318e2f614e8c57a0a9a6d175d2909ba1dbc21 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 14:20:45 +0800
Subject: [PATCH] feat(purchase): 新增供应商往来及往来明细接口功能
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 50 +++++++++++++-------------------------------------
1 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index f501849..ecdd1f3 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -9,6 +9,12 @@
SET contract_amount = #{totalTaxInclusiveAmount}
WHERE id = #{id}
</update>
+ <select id="selectPurchaseStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
+ SELECT DATE_FORMAT(entry_date, #{dateFormat}) as dateStr, IFNULL(SUM(contract_amount), 0) as amount
+ FROM purchase_ledger
+ WHERE entry_date BETWEEN #{startDate} AND #{endDate}
+ GROUP BY dateStr
+ </select>
<select id="selectPurchaseLedgerListPage" resultType="com.ruoyi.purchase.dto.PurchaseLedgerDto">
SELECT
@@ -19,8 +25,6 @@
pl.supplier_name,
pl.project_name,
pl.contract_amount,
- IFNULL(tr_sum.total_invoice_amount, 0) AS receipt_payment_amount,
- pl.contract_amount - IFNULL(tr_sum.total_invoice_amount, 0) AS unReceipt_payment_amount,
pl.entry_date,
pl.execution_date,
pl.recorder_id,
@@ -32,13 +36,6 @@
pl.payment_method,
pl.remarks
FROM purchase_ledger pl
- LEFT JOIN (
- SELECT
- purchase_ledger_id,
- SUM(invoice_amount) AS total_invoice_amount
- FROM ticket_registration
- GROUP BY purchase_ledger_id
- ) tr_sum ON pl.id = tr_sum.purchase_ledger_id
LEFT JOIN supplier_manage sm ON pl.supplier_id = sm.id
<where>
<if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
@@ -62,35 +59,14 @@
<if test="c.entryDateEnd != null and c.entryDateEnd != ''">
AND pl.entry_date <= #{c.entryDateEnd}
</if>
+ <if test="c.supplierId != null">
+ AND pl.supplier_id = #{c.supplierId}
+ </if>
+ <if test="c.approvalStatus != null">
+ AND pl.approval_status = #{c.approvalStatus}
+ </if>
</where>
ORDER BY pl.entry_date DESC
- </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
- WHERE
- T1.sales_ledger_product_id = #{id}
- </select>
-
-
- <select id="selectPurchaseStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
- SELECT DATE_FORMAT(entry_date, #{dateFormat}) as dateStr, IFNULL(SUM(contract_amount), 0) as amount
- FROM purchase_ledger
- WHERE entry_date BETWEEN #{startDate} AND #{endDate}
- GROUP BY dateStr
</select>
<select id="selectTotalPurchaseAmount" resultType="java.math.BigDecimal">
@@ -105,4 +81,4 @@
</if>
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3