From f5624a59380db70633eebe3612e2d3c703012b41 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 08 一月 2026 17:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index f17aca8..dc3048e 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -19,6 +19,13 @@
<if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
AND product_name = #{qualityInspect.productName}
</if>
+ <if test="qualityInspect.entryDateStart != null and qualityInspect.entryDateStart != '' ">
+ AND check_time >= DATE_FORMAT(#{qualityInspect.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
+ AND check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
+ </if>
+ ORDER BY check_time DESC
</select>
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
@@ -39,4 +46,13 @@
AND product_name = #{qualityInspect.productName}
</if>
</select>
+
+ <delete id="deleteByProductMainIds">
+ DELETE FROM quality_inspect
+ WHERE product_main_id IN
+ <foreach collection="productMainIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+
</mapper>
--
Gitblit v1.9.3