From 57d35cf189578a9060b4a8723bd7792b8ee8f88a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 09 二月 2026 16:47:18 +0800
Subject: [PATCH] feat(quality): 添加不合格品处理标识字段
---
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index f28dbd1..fd433f2 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -3,8 +3,29 @@
<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,
+ CASE
+ WHEN qu.model = pm.id THEN true
+ ELSE false
+ END AS method
+ FROM quality_unqualified qu
+ LEFT JOIN product_model pm ON qu.model = pm.id
where
1=1
<if test="qualityUnqualified.inspectType != null ">
@@ -16,6 +37,12 @@
<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">
SELECT
--
Gitblit v1.9.3