From 2a9c3934bb093c978a54a1c3e220e6a120855e77 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 09 一月 2026 15:11:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/purchase/ProductRecordMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
index dd5aac6..2c0cba4 100644
--- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml
+++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -13,8 +13,12 @@
pm.model AS product_model,
pl.purchase_contract_number,
pl.supplier_name,
+ pl.project_name,
pr.*,
tr.invoice_number,
+ tr.iss_uer_id,
+ tr.iss_uer,
+ tr.id as ticketRegistrationId,
ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price,
ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount
FROM product_record pr
@@ -24,10 +28,10 @@
left join product_model pm on pm.id = pr.product_model_id
WHERE type = 2
<if test="c.salesContractNo != null and c.salesContractNo != ''">
- and sl.sales_contract_no = #{c.salesContractNo}
+ and sl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
</if>
<if test="c.supplierName != null and c.supplierName != ''">
- and sl.supplier_name = #{c.supplierName}
+ and pl.supplier_name like concat('%',#{c.supplierName},'%')
</if>
<if test="c.createdAtStart != null and c.createdAtStart != ''">
and pr.created_at >= date_format(#{c.createdAtStart},'%Y-%m-%d hh:mm:ss')
--
Gitblit v1.9.3