From 5da5bf5cb70a889645e156eff869ff276c5a573b Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 16 七月 2025 16:38:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 3fed962..bc6c38a 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -25,8 +25,24 @@
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>
</where>
group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
--
Gitblit v1.9.3