From a610cbd7e6b7631254f15c832afce6e747b3581d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 四月 2026 14:36:02 +0800
Subject: [PATCH] 生产报表相关接口
---
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 7b48b5f..001a27c 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -17,16 +17,14 @@
qu.deal_name,
qu.deal_time,
qu.quarantine_lifted,
+ qu.model,
+ pm.material_code as materialCode,
CASE
- WHEN qu.model = pm.id THEN pm.model
- ELSE qu.model
- END AS model,
- CASE
- WHEN qu.model = pm.id THEN true
+ WHEN qu.inspect_id is null THEN true
ELSE false
END AS method
FROM quality_unqualified qu
- LEFT JOIN product_model pm ON qu.model = pm.id
+ LEFT JOIN product_model pm ON qu.model = pm.model
where
1=1
<if test="qualityUnqualified.inspectType != null ">
@@ -47,8 +45,10 @@
</select>
<select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
SELECT
- *
- FROM quality_unqualified
+ qu.*,
+ pm.material_code as materialCode
+ FROM quality_unqualified qu
+ LEFT JOIN product_model pm ON qu.model = pm.model
where
1=1
<if test="qualityUnqualified.inspectType != null">
@@ -77,16 +77,14 @@
qu.deal_name,
qu.deal_time,
qi.process,
+ qu.model,
+ pm.material_code as materialCode,
CASE
- WHEN qu.model = pm.id THEN pm.model
- ELSE qu.model
- END AS model,
- CASE
- WHEN qu.model = pm.id THEN true
+ WHEN qu.inspect_id is null THEN true
ELSE false
END AS method
FROM quality_unqualified qu
- LEFT JOIN product_model pm ON qu.model = pm.id
+ LEFT JOIN product_model pm ON qu.model = pm.model
LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
where
1=1
--
Gitblit v1.9.3