From dce3d86ba66f008832a4e63f2a9cd5fd3544a27c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 02 二月 2026 11:18:24 +0800
Subject: [PATCH] fix: 质量管理-报表管理数据查询错误修改
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 499 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 292 insertions(+), 207 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index ba7e8b8..0efab8c 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -56,84 +56,123 @@
</delete>
<select id="getInspectStatistics" resultType="com.ruoyi.quality.dto.QualityInspectStatDto">
- SELECT 0 AS inspectType,
- COALESCE((SELECT SUM(inbound_num) FROM procurement_record_storage WHERE type = 1), 0) +
- COALESCE((SELECT SUM(quantity) FROM quality_unqualified WHERE inspect_type = 0), 0) AS totalCount,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 1
- AND quality_inspect_id != 0
- AND quality_inspect_id IS NOT NULL), 0) +
- COALESCE((SELECT SUM(quantity) FROM quality_unqualified WHERE inspect_type = 0), 0) AS completedCount
- UNION ALL
- SELECT 1 AS inspectType,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 2
- AND sales_ledger_product_id = 0), 0) AS totalCount,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 2
- AND sales_ledger_product_id = 0
- AND quality_inspect_id != 0
- AND quality_inspect_id IS NOT NULL), 0) AS completedCount
- UNION ALL
- SELECT 2 AS inspectType,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 2
- AND sales_ledger_product_id != 0), 0) AS totalCount,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 2
- AND sales_ledger_product_id != 0
- AND quality_inspect_id != 0
- AND quality_inspect_id IS NOT NULL), 0) AS completedCount
+ SELECT CASE pp.product_name
+ WHEN '鍘熸潗鏂�' THEN 0
+ WHEN '鍗婃垚鍝�' THEN 1
+ WHEN '鎴愬搧' THEN 2
+ END AS modelType,
+
+ IFNULL(SUM(qi.quantity), 0) AS totalCount,
+
+ IFNULL(SUM(CASE
+ WHEN qi.inspect_state = 1 THEN qi.quantity
+ ELSE 0
+ END), 0) AS completedCount
+
+ FROM product p
+ INNER JOIN product pp
+ ON p.parent_id = pp.id
+ LEFT JOIN product_model pm
+ ON pm.product_id = p.id
+ LEFT JOIN quality_inspect qi
+ ON qi.product_model_id = pm.id
+
+ WHERE pp.product_name IN ('鍘熸潗鏂�', '鍗婃垚鍝�', '鎴愬搧')
+
+ GROUP BY pp.product_name
+
</select>
<select id="getPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityPassRateDto">
- SELECT t.inspectType,
- COALESCE(prs.totalCount, 0) AS totalCount,
- COALESCE(qi.completedCount, 0) AS completedCount,
- COALESCE(qi.qualifiedCount, 0) AS qualifiedCount,
- COALESCE(qi.unqualifiedCount, 0) AS unqualifiedCount,
- IF(COALESCE(prs.totalCount, 0) = 0, 0,
- ROUND(COALESCE(qi.completedCount, 0) / prs.totalCount * 100, 2)) AS completionRate,
- IF(COALESCE(qi.completedCount, 0) = 0, 0,
- ROUND(COALESCE(qi.qualifiedCount, 0) / qi.completedCount * 100, 2)) AS passRate
- FROM (SELECT 0 AS inspectType
+ SELECT t.modelType,
+
+ COALESCE(SUM(qi.quantity), 0) AS totalCount,
+
+ COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1 THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) AS completedCount,
+
+ COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1
+ AND qi.check_result = '鍚堟牸'
+ THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) AS qualifiedCount,
+
+ COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1
+ AND qi.check_result = '涓嶅悎鏍�'
+ THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) AS unqualifiedCount,
+
+ /* 瀹屾垚鐜� */
+ IF(COALESCE(SUM(qi.quantity), 0) = 0, 0,
+ ROUND(
+ COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1 THEN qi.quantity
+ ELSE 0
+ END
+ ), 0)
+ / SUM(qi.quantity) * 100, 2)
+ ) AS completionRate,
+
+ /* 鍚堟牸鐜� */
+ IF(COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1 THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) = 0, 0,
+ ROUND(
+ COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1
+ AND qi.check_result = '鍚堟牸'
+ THEN qi.quantity
+ ELSE 0
+ END
+ ), 0)
+ /
+ COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1 THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) * 100, 2)
+ ) AS passRate
+
+ FROM (SELECT 0 AS modelType
UNION ALL
SELECT 1
UNION ALL
SELECT 2) t
- LEFT JOIN (SELECT inspect_type,
- SUM(quantity) AS completedCount,
- SUM(IF(check_result = '鍚堟牸', quantity, 0)) AS qualifiedCount,
- SUM(IF(check_result = '涓嶅悎鏍�', quantity, 0)) AS unqualifiedCount
- FROM quality_inspect
- WHERE inspect_state = 1
- GROUP BY inspect_type) qi
- ON t.inspectType = qi.inspect_type
- LEFT JOIN (SELECT 0 AS inspectType,
- COALESCE((SELECT SUM(inbound_num) FROM procurement_record_storage WHERE type = 1),
- 0) +
- COALESCE((SELECT SUM(quantity) FROM quality_unqualified WHERE inspect_type = 0),
- 0) AS totalCount
- UNION ALL
- SELECT 1 AS inspectType,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 2
- AND sales_ledger_product_id = 0), 0) AS totalCount
- UNION ALL
- SELECT 2 AS inspectType,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 2
- AND sales_ledger_product_id != 0), 0) AS totalCount) prs
- ON t.inspectType = prs.inspectType
- ORDER BY t.inspectType;
+ LEFT JOIN product p
+ ON 1 = 1
+ LEFT JOIN product pp
+ ON p.parent_id = pp.id
+ LEFT JOIN product_model pm
+ ON pm.product_id = p.id
+ LEFT JOIN quality_inspect qi
+ ON qi.product_model_id = pm.id
+ AND (
+ (pp.product_name = '鍘熸潗鏂�' AND t.modelType = 0) OR
+ (pp.product_name = '鍗婃垚鍝�' AND t.modelType = 1) OR
+ (pp.product_name = '鎴愬搧' AND t.modelType = 2)
+ )
+
+ GROUP BY t.modelType
+ ORDER BY t.modelType;
</select>
+
<select id="getMonthlyPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityMonthlyPassRateDto">
WITH RECURSIVE
@@ -142,50 +181,15 @@
SELECT month_num + 1
FROM months
WHERE month_num < 12),
- types AS (SELECT 0 AS inspectType
+ types AS (SELECT 0 AS modelType
UNION ALL
SELECT 1
UNION ALL
SELECT 2),
- base AS (SELECT m.month_num, t.inspectType
- FROM months m,
- types t),
- qi_data AS (SELECT MONTH(check_time) AS month_num,
- inspect_type,
- SUM(quantity) AS completedCount,
- SUM(CASE WHEN check_result = '鍚堟牸' THEN quantity ELSE 0 END) AS qualifiedCount,
- SUM(CASE WHEN check_result = '涓嶅悎鏍�' THEN quantity ELSE 0 END) AS unqualifiedCount
- FROM quality_inspect
- WHERE YEAR(check_time) = #{year}
- AND inspect_state = 1
- GROUP BY MONTH(check_time), inspect_type),
- prs_data AS (SELECT month_num,
- inspectType,
- SUM(totalCount) AS totalCount
- FROM (SELECT MONTH(create_time) AS month_num,
- 0 AS inspectType,
- inbound_num AS totalCount
- FROM procurement_record_storage
- WHERE type = 1
- AND YEAR(create_time) = #{year}
- UNION ALL
- SELECT MONTH(check_time) AS month_num,
- 0 AS inspectType,
- quantity AS totalCount
- FROM quality_unqualified
- WHERE inspect_type = 0
- AND YEAR(check_time) = #{year}
- UNION ALL
- SELECT MONTH(create_time) AS month_num,
- CASE
- WHEN sales_ledger_product_id = 0 THEN 1
- ELSE 2
- END AS inspectType,
- inbound_num AS totalCount
- FROM procurement_record_storage
- WHERE type = 2
- AND YEAR(create_time) = #{year}) sub
- GROUP BY month_num, inspectType)
+ base AS (SELECT m.month_num, t.modelType
+ FROM months m
+ CROSS JOIN types t)
+
SELECT CASE b.month_num
WHEN 1 THEN '涓�鏈�'
WHEN 2 THEN '浜屾湀'
@@ -199,96 +203,121 @@
WHEN 10 THEN '鍗佹湀'
WHEN 11 THEN '鍗佷竴鏈�'
WHEN 12 THEN '鍗佷簩鏈�'
- END AS month,
- b.inspectType,
- COALESCE(p.totalCount, 0) AS totalCount,
- COALESCE(q.completedCount, 0) AS completedCount,
- COALESCE(q.qualifiedCount, 0) AS qualifiedCount,
- COALESCE(q.unqualifiedCount, 0) AS unqualifiedCount,
- CASE
- WHEN COALESCE(p.totalCount, 0) = 0 THEN 0
- ELSE ROUND(COALESCE(q.completedCount, 0) / p.totalCount * 100, 2)
- END AS completionRate,
- CASE
- WHEN COALESCE(q.completedCount, 0) = 0 THEN 0
- ELSE ROUND(COALESCE(q.qualifiedCount, 0) / q.completedCount * 100, 2)
- END AS passRate
+ END AS month,
+
+ b.modelType,
+
+ /* 鎬绘暟閲� */
+ COALESCE(SUM(qi.quantity), 0) AS totalCount,
+
+ /* 宸插畬鎴� */
+ COALESCE(SUM(
+ CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END
+ ), 0) AS completedCount,
+
+ /* 鍚堟牸 */
+ COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸'
+ THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) AS qualifiedCount,
+
+ /* 涓嶅悎鏍� */
+ COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1 AND qi.check_result = '涓嶅悎鏍�'
+ THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) AS unqualifiedCount,
+
+ /* 瀹屾垚鐜� */
+ IF(COALESCE(SUM(qi.quantity), 0) = 0, 0,
+ ROUND(
+ COALESCE(SUM(
+ CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END
+ ), 0) / SUM(qi.quantity) * 100, 2
+ )
+ ) AS completionRate,
+
+ /* 鍚堟牸鐜� */
+ IF(COALESCE(SUM(
+ CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END
+ ), 0) = 0, 0,
+ ROUND(
+ COALESCE(SUM(
+ CASE
+ WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸'
+ THEN qi.quantity
+ ELSE 0
+ END
+ ), 0)
+ /
+ COALESCE(SUM(
+ CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END
+ ), 0) * 100, 2
+ )
+ ) AS passRate
+
FROM base b
- LEFT JOIN qi_data q ON b.month_num = q.month_num AND b.inspectType = q.inspect_type
- LEFT JOIN prs_data p ON b.month_num = p.month_num AND b.inspectType = p.inspectType
- ORDER BY b.month_num, b.inspectType
+ LEFT JOIN product p ON 1 = 1
+ LEFT JOIN product pp ON p.parent_id = pp.id
+ LEFT JOIN product_model pm ON pm.product_id = p.id
+ LEFT JOIN quality_inspect qi
+ ON qi.product_model_id = pm.id
+ AND YEAR(qi.check_time) = #{year}
+ AND MONTH(qi.check_time) = b.month_num
+ AND (
+ (pp.product_name = '鍘熸潗鏂�' AND b.modelType = 0)
+ OR (pp.product_name = '鍗婃垚鍝�' AND b.modelType = 1)
+ OR (pp.product_name = '鎴愬搧' AND b.modelType = 2)
+ )
+
+ GROUP BY b.month_num, b.modelType
+ ORDER BY b.month_num, b.modelType;
+
</select>
<select id="getYearlyPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityPassRateDto">
- SELECT t.inspectType,
- COALESCE(prs.totalCount, 0) AS totalCount,
- COALESCE(qi.completedCount, 0) AS completedCount,
- COALESCE(qi.qualifiedCount, 0) AS qualifiedCount,
- COALESCE(qi.unqualifiedCount, 0) AS unqualifiedCount,
- CASE
- WHEN COALESCE(prs.totalCount, 0) = 0 THEN 0
- ELSE ROUND(COALESCE(qi.completedCount, 0) / prs.totalCount * 100, 2)
- END AS completionRate,
- CASE
- WHEN COALESCE(qi.completedCount, 0) = 0 THEN 0
- ELSE ROUND(COALESCE(qi.qualifiedCount, 0) / qi.completedCount * 100, 2)
- END AS passRate
- FROM (SELECT 0 AS inspectType
+ SELECT t.modelType,
+
+ COALESCE(SUM(
+ CASE
+ WHEN pp.product_name = '鍘熸潗鏂�' AND t.modelType = 0 THEN qi.quantity
+ WHEN pp.product_name = '鍗婃垚鍝�' AND t.modelType = 1 THEN qi.quantity
+ WHEN pp.product_name = '鎴愬搧' AND t.modelType = 2 THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) AS totalCount
+
+ FROM (SELECT 0 AS modelType
UNION ALL
SELECT 1
UNION ALL
SELECT 2) t
- LEFT JOIN (SELECT inspect_type,
- SUM(quantity) AS completedCount,
- SUM(CASE WHEN check_result = '鍚堟牸' THEN quantity ELSE 0 END) AS qualifiedCount,
- SUM(CASE WHEN check_result = '涓嶅悎鏍�' THEN quantity ELSE 0 END) AS unqualifiedCount
- FROM quality_inspect
- WHERE YEAR(check_time) = #{year}
- AND inspect_state = 1
- GROUP BY inspect_type) qi
- ON t.inspectType = qi.inspect_type
- LEFT JOIN (SELECT 0 AS inspectType,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 1
- AND YEAR(create_time) = #{year}), 0) +
- COALESCE((SELECT SUM(quantity)
- FROM quality_unqualified
- WHERE inspect_type = 0
- AND YEAR(check_time) = #{year}), 0) AS totalCount
- UNION ALL
- SELECT 1 AS inspectType,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 2
- AND sales_ledger_product_id = 0
- AND YEAR(create_time) = #{year}), 0) AS totalCount
- UNION ALL
- SELECT 2 AS inspectType,
- COALESCE((SELECT SUM(inbound_num)
- FROM procurement_record_storage
- WHERE type = 2
- AND sales_ledger_product_id != 0
- AND YEAR(create_time) = #{year}), 0) AS totalCount) prs
- ON t.inspectType = prs.inspectType
- ORDER BY t.inspectType
+ LEFT JOIN product p ON 1 = 1
+ LEFT JOIN product pp ON p.parent_id = pp.id
+ LEFT JOIN product_model pm ON pm.product_id = p.id
+ LEFT JOIN quality_inspect qi
+ ON qi.product_model_id = pm.id
+ AND YEAR(qi.check_time) = #{year}
+ AND qi.inspect_state = 1
+ AND qi.check_result = '鍚堟牸'
+
+ GROUP BY t.modelType
+ ORDER BY t.modelType;
</select>
+
+
<select id="getMonthlyCompletionDetails" resultType="com.ruoyi.quality.dto.QualityMonthlyDetailDto">
- WITH RECURSIVE
- months AS (SELECT 1 AS month_num
- UNION ALL
- SELECT month_num + 1
- FROM months
- WHERE month_num < 12),
- qi_data AS (SELECT MONTH(check_time) AS month_num,
- SUM(CASE WHEN inspect_type = 0 THEN quantity ELSE 0 END) AS rawMaterialCount,
- SUM(CASE WHEN inspect_type = 1 THEN quantity ELSE 0 END) AS processCount,
- SUM(CASE WHEN inspect_type = 2 THEN quantity ELSE 0 END) AS outgoingCount
- FROM quality_inspect
- WHERE YEAR(check_time) = #{year}
- AND inspect_state = 1
- GROUP BY MONTH(check_time))
+ WITH RECURSIVE months AS (SELECT 1 AS month_num
+ UNION ALL
+ SELECT month_num + 1
+ FROM months
+ WHERE month_num < 12)
SELECT CASE m.month_num
WHEN 1 THEN '涓�鏈�'
WHEN 2 THEN '浜屾湀'
@@ -302,39 +331,95 @@
WHEN 10 THEN '鍗佹湀'
WHEN 11 THEN '鍗佷竴鏈�'
WHEN 12 THEN '鍗佷簩鏈�'
- END AS month,
- COALESCE(d.rawMaterialCount, 0) AS rawMaterialCount,
- COALESCE(d.processCount, 0) AS processCount,
- COALESCE(d.outgoingCount, 0) AS outgoingCount
+ END AS month,
+
+ /* 鍘熸潗鏂� */
+ COALESCE(SUM(
+ CASE
+ WHEN pp.product_name = '鍘熸潗鏂�'
+ THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) AS rawMaterialCount,
+
+ /* 鍗婃垚鍝� */
+ COALESCE(SUM(
+ CASE
+ WHEN pp.product_name = '鍗婃垚鍝�'
+ THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) AS processCount,
+
+ /* 鎴愬搧 */
+ COALESCE(SUM(
+ CASE
+ WHEN pp.product_name = '鎴愬搧'
+ THEN qi.quantity
+ ELSE 0
+ END
+ ), 0) AS outgoingCount
+
FROM months m
- LEFT JOIN qi_data d ON m.month_num = d.month_num
- ORDER BY m.month_num
+ LEFT JOIN product p ON 1 = 1
+ LEFT JOIN product pp ON p.parent_id = pp.id
+ LEFT JOIN product_model pm ON pm.product_id = p.id
+ LEFT JOIN quality_inspect qi
+ ON qi.product_model_id = pm.id
+ AND qi.inspect_state = 1
+ AND YEAR(qi.check_time) = #{year}
+ AND MONTH(qi.check_time) = m.month_num
+
+ GROUP BY m.month_num
+ ORDER BY m.month_num;
+
</select>
<select id="getTopParameters" resultType="com.ruoyi.quality.dto.QualityParameterStatDto">
- WITH parameter_counts AS (SELECT qip.parameter_item AS name, COUNT(*) AS count
+ WITH parameter_counts AS (SELECT qip.parameter_item AS name,
+ COUNT(*) AS count
FROM quality_inspect_param qip
- JOIN quality_inspect qi ON qip.inspect_id = qi.id
- WHERE qi.inspect_type = #{inspectType}
+ JOIN quality_inspect qi
+ ON qip.inspect_id = qi.id
+ JOIN product p
+ ON qi.product_id = p.id
+ JOIN product pp
+ ON p.parent_id = pp.id
+ WHERE qi.inspect_state = 1
+ AND (
+ (#{modelType} = 1 AND pp.product_name = '鍘熸潗鏂�')
+ OR (#{modelType} = 2 AND pp.product_name = '鍗婃垚鍝�')
+ OR (#{modelType} = 3 AND pp.product_name = '鎴愬搧')
+ )
GROUP BY qip.parameter_item),
- total AS (SELECT SUM(count) as total_count
- FROM parameter_counts),
- ranked AS (SELECT name, count, ROW_NUMBER() OVER (ORDER BY count DESC) as rn
- FROM parameter_counts)
+ ranked AS (SELECT name,
+ count,
+ ROW_NUMBER() OVER (ORDER BY count DESC) AS rn
+ FROM parameter_counts),
+ total AS (SELECT SUM(count) AS total_count
+ FROM parameter_counts)
+
SELECT name,
count,
CASE
WHEN (SELECT total_count FROM total) = 0 THEN 0
ELSE ROUND(count / (SELECT total_count FROM total) * 100, 2)
- END as percentage
+ END AS percentage
FROM (SELECT name, count, rn
FROM ranked
WHERE rn <= 4
+
UNION ALL
- SELECT '鍏朵粬' as name, SUM(count) as count, 5 as rn
+
+ SELECT '鍏朵粬妫�娴�' AS name,
+ SUM(count) AS count,
+ 5 AS rn
FROM ranked
- WHERE rn > 4
- HAVING count > 0) sub
- ORDER BY rn
+ WHERE rn > 4
+ HAVING SUM(count) > 0) t
+ ORDER BY rn;
+
</select>
+
+
</mapper>
--
Gitblit v1.9.3