From 5303724901f83673d2cd0e33a80ea9a51a60c786 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 11:12:27 +0800
Subject: [PATCH] fix： 质量管理-报表管理修改
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 481 ++++++++++++++++++++++++++++-------------------------
1 files changed, 256 insertions(+), 225 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 8058455..0ccfbea 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -3,30 +3,49 @@
<mapper namespace="com.ruoyi.quality.mapper.QualityInspectMapper">
<select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
- *
- FROM quality_inspect
- where
+ qi.*,
+ <choose>
+ <when test="qualityInspect.inspectType == 0">
+ pl.purchase_contract_number as purchase_contract_no
+ </when>
+ <otherwise>
+ pwo.work_order_no
+ </otherwise>
+ </choose>
+ FROM
+ quality_inspect qi
+ <choose>
+ <when test="qualityInspect.inspectType == 0 ">
+ LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
+ </when>
+ <otherwise>
+ LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
+ LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+ </otherwise>
+ </choose>
+ WHERE
inspect_type=#{qualityInspect.inspectType}
<if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
- AND supplier like concat('%',#{qualityInspect.supplier},'%')
+ AND qi.supplier like concat('%',#{qualityInspect.supplier},'%')
</if>
<if test="qualityInspect.customer != null and qualityInspect.customer != '' ">
- AND customer like concat('%',#{qualityInspect.customer},'%')
+ AND qi.customer like concat('%',#{qualityInspect.customer},'%')
</if>
<if test="qualityInspect.process != null and qualityInspect.process != '' ">
- AND process like concat('%',#{qualityInspect.process},'%')
+ AND qi.process like concat('%',#{qualityInspect.process},'%')
</if>
<if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
- AND product_name like concat('%',#{qualityInspect.productName},'%')
+ AND qi.product_name like concat('%',#{qualityInspect.productName},'%')
</if>
<if test="qualityInspect.entryDateStart != null and qualityInspect.entryDateStart != '' ">
- AND check_time >= DATE_FORMAT(#{qualityInspect.entryDateStart},'%Y-%m-%d')
+ AND qi.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')
+ AND qi.check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
</if>
- ORDER BY check_time DESC
+ ORDER BY qi.check_time DESC
</select>
+
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
*
@@ -56,83 +75,88 @@
</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
+ WITH RECURSIVE product_tree AS (SELECT id,
+ parent_id,
+ product_name,
+ id AS root_id,
+ product_name AS root_name
+ FROM product
+ WHERE product_name IN ('鍘熸枡', '鍗婃垚鍝�', '鎴愬搧')
+ UNION ALL
+ SELECT p.id,
+ p.parent_id,
+ p.product_name,
+ pt.root_id,
+ pt.root_name
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id)
+ SELECT CASE pt.root_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_tree pt
+ INNER JOIN product_model pm ON pm.product_id = pt.id
+ LEFT JOIN quality_inspect qi ON qi.product_model_id = pm.id
+ GROUP BY pt.root_id, pt.root_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
+ WITH RECURSIVE product_tree AS (SELECT id,
+ product_name,
+ CASE product_name
+ WHEN '鍘熸枡' THEN 0
+ WHEN '鍗婃垚鍝�' THEN 1
+ WHEN '鎴愬搧' THEN 2
+ END AS modelType
+ FROM product
+ WHERE product_name IN ('鍘熸枡', '鍗婃垚鍝�', '鎴愬搧')
+
+ UNION ALL
+
+ SELECT p.id,
+ p.product_name,
+ pt.modelType
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id)
+
+ SELECT base.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(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END)
+ / SUM(qi.quantity) * 100, 2)
+ ) AS completionRate,
+
+ IF(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) = 0, 0,
+ ROUND(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸' THEN qi.quantity ELSE 0 END)
+ / SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) * 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;
+ SELECT 2) base
+ LEFT JOIN product_tree pt ON base.modelType = pt.modelType
+ LEFT JOIN product_model pm ON pm.product_id = pt.id
+ LEFT JOIN quality_inspect qi ON qi.product_model_id = pm.id
+
+ GROUP BY base.modelType
+ ORDER BY base.modelType
</select>
<select id="getMonthlyPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityMonthlyPassRateDto">
@@ -142,50 +166,25 @@
SELECT month_num + 1
FROM months
WHERE month_num < 12),
- types AS (SELECT 0 AS inspectType
- 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)
+ product_tree AS (SELECT id,
+ product_name,
+ CASE product_name
+ WHEN '鍘熸枡' THEN 0
+ WHEN '鍗婃垚鍝�' THEN 1
+ WHEN '鎴愬搧' THEN 2
+ END AS modelType
+ FROM product
+ WHERE product_name IN ('鍘熸枡', '鍗婃垚鍝�', '鎴愬搧')
+
+ UNION ALL
+
+ SELECT p.id, p.product_name, pt.modelType
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id),
+ base_matrix AS (SELECT m.month_num, t.modelType
+ FROM months m
+ CROSS JOIN (SELECT 0 AS modelType UNION ALL SELECT 1 UNION ALL SELECT 2) t)
+
SELECT CASE b.month_num
WHEN 1 THEN '涓�鏈�'
WHEN 2 THEN '浜屾湀'
@@ -199,79 +198,84 @@
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
- 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
+ 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(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) / SUM(qi.quantity) * 100, 2)
+ ) AS completionRate,
+
+ /* 鍚堟牸鐜� */
+ IF(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) = 0, 0,
+ ROUND(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸' THEN qi.quantity ELSE 0 END)
+ / SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) * 100, 2)
+ ) AS passRate
+
+ FROM base_matrix b
+ LEFT JOIN product_tree pt ON b.modelType = pt.modelType
+ -- 鍏宠仈浜у搧妯″瀷
+ LEFT JOIN product_model pm ON pm.product_id = pt.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
+
+ 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
- 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
+ WITH RECURSIVE
+ product_tree AS (SELECT id,
+ product_name,
+ CASE product_name
+ WHEN '鍘熸枡' THEN 0
+ WHEN '鍗婃垚鍝�' THEN 1
+ WHEN '鎴愬搧' THEN 2
+ END AS modelType
+ FROM product
+ WHERE product_name IN ('鍘熸枡', '鍗婃垚鍝�', '鎴愬搧')
+
+ UNION ALL
+
+ SELECT p.id, p.product_name, pt.modelType
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id),
+ types AS (SELECT 0 AS modelType
+ UNION ALL
+ SELECT 1
+ UNION ALL
+ SELECT 2)
+
+ 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,
+
+ IF(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) = 0, 0,
+ ROUND(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸' THEN qi.quantity ELSE 0 END)
+ / SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) * 100, 2)
+ ) AS passRate
+
+ FROM types t
+ LEFT JOIN product_tree pt ON t.modelType = pt.modelType
+ LEFT JOIN product_model pm ON pm.product_id = pt.id
+ LEFT JOIN quality_inspect qi ON qi.product_model_id = pm.id
+ AND YEAR(qi.check_time) = #{year}
+
+ GROUP BY t.modelType
+ ORDER BY t.modelType
</select>
<select id="getMonthlyCompletionDetails" resultType="com.ruoyi.quality.dto.QualityMonthlyDetailDto">
@@ -281,14 +285,15 @@
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))
+ product_tree AS (SELECT id, product_name AS root_name
+ FROM product
+ WHERE product_name IN ('鍘熸枡', '鍗婃垚鍝�', '鎴愬搧')
+
+ UNION ALL
+
+ SELECT p.id, pt.root_name
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id)
SELECT CASE m.month_num
WHEN 1 THEN '涓�鏈�'
WHEN 2 THEN '浜屾湀'
@@ -302,28 +307,55 @@
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 pt.root_name = '鍘熸枡' THEN qi.quantity ELSE 0 END), 0) AS rawMaterialCount,
+
+ COALESCE(SUM(CASE WHEN pt.root_name = '鍗婃垚鍝�' THEN qi.quantity ELSE 0 END), 0) AS processCount,
+
+ COALESCE(SUM(CASE WHEN pt.root_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
+ LEFT JOIN product_tree pt ON 1 = 1
+ LEFT JOIN product_model pm ON pm.product_id = pt.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,
- SUM(COALESCE(qi.quantity, 0)) AS count
- FROM quality_inspect qi
- JOIN quality_inspect_param qip ON qip.inspect_id = qi.id
- WHERE qi.inspect_type = #{inspectType}
- GROUP BY qip.parameter_item),
- 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)
+ WITH RECURSIVE
+ -- 1. 鎵惧埌瀵瑰簲鐨勬牴鑺傜偣
+ root_node AS (SELECT id, product_name
+ FROM product
+ WHERE (
+ (#{modelType} = 1 AND product_name = '鍘熸枡')
+ OR (#{modelType} = 2 AND product_name = '鍗婃垚鍝�')
+ OR (#{modelType} = 3 AND product_name = '鎴愬搧')
+ )),
+ target_ids AS (SELECT id
+ FROM root_node
+ UNION ALL
+ SELECT p.id
+ FROM product p
+ INNER JOIN target_ids ti ON p.parent_id = ti.id),
+ 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_state = 1
+ AND qi.product_id IN (SELECT id FROM target_ids)
+ GROUP BY qip.parameter_item),
+ 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
@@ -334,13 +366,12 @@
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 SUM(count) > 0) t
+ WHERE rn > 4
+ HAVING SUM(count) > 0) t
ORDER BY rn
</select>
+
</mapper>
--
Gitblit v1.9.3