From a723ddd9b7cfefc94af4f15c1f9f30e59cd38ecc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 22 五月 2026 10:26:04 +0800
Subject: [PATCH] 设备台账导入数据，判断含税总价是否为空
---
src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml b/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
index 3571783..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}
@@ -47,7 +49,7 @@
SELECT DATE_FORMAT(payment_date, #{dateFormat}) AS dateStr,
IFNULL(SUM(payment_amount), 0) AS amount
FROM account_purchase_payment
- WHERE payment_date BETWEEN #{startDate} AND #{endDate}
+ WHERE payment_date BETWEEN #{startStr} AND #{endStr}
GROUP BY dateStr
ORDER BY dateStr
</select>
--
Gitblit v1.9.3