From 8ed9be0eaff405580e87715bbd5b018b8b067eab Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 24 四月 2026 10:13:05 +0800
Subject: [PATCH] feat(approve): 添加知识库附件管理功能并修复订单编号生成问题
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 7490a65..247d7bb 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -185,27 +185,27 @@
</select>
<select id="supplierNameListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
SELECT
- T1.supplier_id ,
- T1.supplier_name,
- SUM(T1.contract_amount) AS invoiceAmount,
- IFNULL(SUM(T2.current_payment_amount), 0) AS paymentAmount,
- IFNULL(SUM(T1.contract_amount) - IFNULL(SUM(T2.current_payment_amount), 0), 0) AS payableAmount
-FROM (
- SELECT id,supplier_id, supplier_name, SUM(contract_amount) contract_amount
- FROM purchase_ledger
- GROUP BY supplier_id, supplier_name
-) T1
-LEFT JOIN (
- SELECT purchase_ledger_id, SUM(current_payment_amount) current_payment_amount
- FROM payment_registration
- GROUP BY purchase_ledger_id
-) T2 ON T1.id = T2.purchase_ledger_id
-<where>
- <if test="req.supplierName != null and req.supplierName != '' ">
+ T1.supplier_id ,
+ T1.supplier_name,
+ SUM(T1.contract_amount) AS invoiceAmount,
+ IFNULL(SUM(T2.current_payment_amount), 0) AS paymentAmount,
+ IFNULL(SUM(T1.contract_amount) - IFNULL(SUM(T2.current_payment_amount), 0), 0) AS payableAmount
+ FROM (
+ SELECT id,supplier_id, supplier_name, SUM(contract_amount) contract_amount
+ FROM purchase_ledger
+ GROUP BY supplier_id, supplier_name,id
+ ) T1
+ LEFT JOIN (
+ SELECT purchase_ledger_id, SUM(current_payment_amount) current_payment_amount
+ FROM payment_registration
+ GROUP BY purchase_ledger_id
+ ) T2 ON T1.id = T2.purchase_ledger_id
+ <where>
+ <if test="req.supplierName != null and req.supplierName != '' ">
T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
- </if>
-</where>
-GROUP BY T1.supplier_id, T1.supplier_name
+ </if>
+ </where>
+ GROUP BY T1.supplier_id, T1.supplier_name
</select>
<select id="supplierNameListPageDetails" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
--
Gitblit v1.9.3