From 3f1d871318231ebabb3be06c4ca2ca770b5b0220 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/resources/mapper/quality/RawMaterialMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/quality/RawMaterialMapper.xml b/src/main/resources/mapper/quality/RawMaterialMapper.xml
index a5869d5..cddecc6 100644
--- a/src/main/resources/mapper/quality/RawMaterialMapper.xml
+++ b/src/main/resources/mapper/quality/RawMaterialMapper.xml
@@ -27,11 +27,17 @@
<if test="params.checkType != null ">
AND rm.check_type = #{params.checkType}
</if>
+ <if test="params.batchNo != null and params.batchNo != ''">
+ and rm.batch_no like concat('%', #{params.batchNo}, '%')
+ </if>
+ <if test="params.inspectState != null ">
+ AND rm.inspect_state = #{params.inspectState}
+ </if>
<if test="params.entryDateStart != null and params.entryDateStart != '' ">
- AND rm.check_time >= DATE_FORMAT(#{params.entryDateStart},'%Y-%m-%d')
+ AND rm.check_time >= #{params.entryDateStart}
</if>
<if test="params.entryDateEnd != null and params.entryDateEnd != '' ">
- AND rm.check_time <= DATE_FORMAT(#{params.entryDateEnd},'%Y-%m-%d')
+ AND rm.check_time <= #{params.entryDateEnd}
</if>
ORDER BY rm.check_time DESC
</select>
--
Gitblit v1.9.3