From d5e4005d30bb2b6116cbb0e44da2c54b8ab88708 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 10:42:21 +0800
Subject: [PATCH] fix(stock): 修复库存查询中多余的字符导致SQL语法错误

---
 src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml |   12 +++++++++++-
 1 files changed, 11 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..89a3681 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}
@@ -43,5 +45,13 @@
             </if>
         </where>
     </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