From 41d35c56043108b66a14e7a2d2d13bedfc2508e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 二月 2026 13:34:42 +0800
Subject: [PATCH] Merge branch 'dev_New' into pcdz
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 98c2675..499522c 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -27,6 +27,7 @@
pl.template_name,
pl.approve_user_ids,
sm.is_white,
+ sm.supplier_type,
pl.approval_status,
pl.payment_method,
pl.remarks
@@ -58,6 +59,9 @@
<if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
AND pl.entry_date <= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
</if>
+ <if test="c.supplierType != null and c.supplierType != '' ">
+ AND sm.supplier_type = #{c.supplierType}
+ </if>
</where>
group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
pl.project_name,pl.entry_date,
--
Gitblit v1.9.3