From 09394848ce262aff81897503d32ec334fd3f2b6f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 15:59:30 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan
---
src/main/resources/mapper/purchase/ProductRecordMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
index 2c0cba4..d3360d7 100644
--- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml
+++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -34,13 +34,16 @@
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')
+ and pr.created_at >= str_to_date(#{c.createdAtStart}, '%Y-%m-%d')
</if>
<if test="c.createdAtEnd != null and c.createdAtEnd != ''">
- and pr.created_at <= date_format(#{c.createdAtEnd},'%Y-%m-%d hh:mm:ss')
+ and pr.created_at < date_add(str_to_date(#{c.createdAtEnd}, '%Y-%m-%d'), interval 1 day)
</if>
<if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
and tr.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+ </if>
+ <if test="c.userId != null and c.userId != '' ">
+ AND pl.recorder_id = #{c.userId}
</if>
</select>
<select id="getProductRecordById" resultType="com.ruoyi.purchase.dto.ProductRecordDto">
@@ -60,7 +63,12 @@
left join sales_ledger sl on sl.id = pl.sales_ledger_id
left join ticket_registration tr on tr.id = pr.ticket_registration_id
left join product_model pm on pm.id = pr.product_model_id
-
- WHERE type = 2 and pr.id = #{id}
+ WHERE type = 2
+ <if test="c.purchaseLedgerId != null and c.purchaseLedgerId != ''">
+ and pr.purchase_ledger_id = #{c.purchaseLedgerId}
+ </if>
+ <if test="c.productModelId != null and c.productModelId != ''">
+ and pm.id = #{c.productModelId}
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3