From bf3858536df66d1793693ee69bddf791ff011092 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 09 二月 2026 16:44:01 +0800
Subject: [PATCH] fix(quality): 修复质量不合格处理逻辑并优化查询性能
---
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index f4fb205..a721a30 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -3,18 +3,41 @@
<mapper namespace="com.ruoyi.quality.mapper.QualityUnqualifiedMapper">
<select id="qualityUnqualifiedListPage" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
SELECT
- *
- FROM quality_unqualified
+ qu.id,
+ qu.inspect_type,
+ qu.inspect_state,
+ qu.check_time,
+ qu.check_name,
+ qu.product_id,
+ qu.product_name,
+ qu.unit,
+ qu.quantity,
+ qu.defective_phenomena,
+ qu.deal_result,
+ qu.deal_name,
+ qu.deal_time,
+ CASE
+ WHEN qu.model = pm.id THEN pm.model
+ ELSE qu.model
+ END AS model
+ FROM quality_unqualified qu
+ LEFT JOIN product_model pm ON qu.model = pm.id
where
1=1
- <if test="qualityUnqualified.inspectType != null and qualityTestStandard.inspectType != '' ">
+ <if test="qualityUnqualified.inspectType != null ">
AND inspect_type = #{qualityUnqualified.inspectType}
</if>
- <if test="qualityUnqualified.inspectState != null and qualityTestStandard.inspectState != '' ">
+ <if test="qualityUnqualified.inspectState != null ">
AND inspect_state = #{qualityUnqualified.inspectState}
</if>
- <if test="qualityUnqualified.productName != null and qualityTestStandard.productName != '' ">
+ <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
AND product_name = #{qualityUnqualified.productName}
+ </if>
+ <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
+ AND check_time >= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
+ AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
</if>
</select>
<select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
@@ -23,13 +46,13 @@
FROM quality_unqualified
where
1=1
- <if test="qualityUnqualified.inspectType != null and qualityTestStandard.inspectType != '' ">
+ <if test="qualityUnqualified.inspectType != null">
AND inspect_type = #{qualityUnqualified.inspectType}
</if>
- <if test="qualityUnqualified.inspectState != null and qualityTestStandard.inspectState != '' ">
+ <if test="qualityUnqualified.inspectState != null">
AND inspect_state = #{qualityUnqualified.inspectState}
</if>
- <if test="qualityUnqualified.productName != null and qualityTestStandard.productName != '' ">
+ <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
AND product_name = #{qualityUnqualified.productName}
</if>
</select>
--
Gitblit v1.9.3