From bdb10f17dd56fdb8dd8e3dca897c5cfb5e40a75d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 16 六月 2026 14:01:12 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml b/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
index 3256586..ed247e5 100644
--- a/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
+++ b/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
@@ -24,10 +24,12 @@
sm.supplier_name,
sm.bank_account_num,
sm.bank_account_name,
- apa.invoice_application_no AS invoiceApplicationNo
+ apa.invoice_application_no AS invoiceApplicationNo,
+ if(asd.receipt_number is not null, true, false) as isAccountStatemen
from account_purchase_payment app
left join supplier_manage sm on app.supplier_id = sm.id
left join account_payment_application apa on app.account_payment_application_id=apa.id
+ left join account_statement_details asd on app.payment_number = asd.receipt_number
<where>
<if test="req.supplierId != null">
AND app.supplier_id = #{req.supplierId}
@@ -42,6 +44,15 @@
AND app.payment_date BETWEEN #{req.startDate} AND #{req.endDate}
</if>
</where>
+ order by app.id desc
+ </select>
+ <select id="selectPayment" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
+ SELECT DATE_FORMAT(payment_date, #{dateFormat}) AS dateStr,
+ IFNULL(SUM(payment_amount), 0) AS amount
+ FROM account_purchase_payment
+ WHERE payment_date BETWEEN #{startStr} AND #{endStr}
+ GROUP BY dateStr
+ ORDER BY dateStr
</select>
</mapper>
--
Gitblit v1.9.3