From 31bb16817c3702b4515a05e010dffa8b490c83b6 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 11:25:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hysn' into hysn
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 3fed962..4b617d1 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -21,12 +21,32 @@
pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
pl.entry_date,
pl.recorder_name,
+ pl.approval_status,
pl.payment_method
from purchase_ledger pl
left join product_record pr on pl.id = pr.purchase_ledger_id
<where>
+ 1 = 1
<if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
- pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+ and pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+ </if>
+ <if test="c.supplierName != null and c.supplierName != ''">
+ and pl.supplier_name like concat('%',#{c.supplierName},'%')
+ </if>
+ <if test="c.salesContractNo != null and c.salesContractNo != ''">
+ and pl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
+ </if>
+ <if test="c.projectName != null and c.projectName != ''">
+ and pl.project_name like concat('%',#{c.projectName},'%')
+ </if>
+ <if test="c.entryDateStart != null and c.entryDateStart != '' ">
+ AND pl.entry_date >= DATE_FORMAT(#{c.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
+ AND pl.entry_date <= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
+ </if>
+ <if test="c.approvalStatus != null">
+ and pl.approval_status =#{c.approvalStatus}
</if>
</where>
group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
@@ -54,4 +74,4 @@
WHERE
T4.id = #{id}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3