From bf2f5e224a3c8df7886581cf06ca65129a89ce90 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 25 五月 2026 09:46:02 +0800
Subject: [PATCH] fix: 报表管理的质检合格率取消四舍五入
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 213 +++++++++++++++++-----------------------------------
1 files changed, 71 insertions(+), 142 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 897138e..72f166c 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -110,73 +110,38 @@
</select>
<select id="getPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityPassRateDto">
- SELECT qi.inspect_type AS modelType,
+ SELECT t.modelType,
+ t.totalCount,
+ t.completedCount,
+ t.qualifiedCount,
+ t.unqualifiedCount,
- COALESCE(SUM(qi.quantity), 0) AS totalCount,
+ /* 瀹屾垚鐜囷細
+ 濡傛灉鎬绘暟涓� 0 鍒欒繑鍥� 0锛涘惁鍒欒绠楁瘮渚嬶紝浣跨敤 TRUNCATE 淇濈暀 4 浣嶅皬鏁帮紙濡� 99.9992锛�
+ */
+ IF(t.totalCount = 0, 0,
+ TRUNCATE((t.completedCount / t.totalCount) * 100, 2)
+ ) AS completionRate,
- 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
- THEN qi.qualified_quantity
- ELSE 0
- END
- ), 0) AS qualifiedCount,
-
- COALESCE(SUM(
- CASE
- WHEN qi.inspect_state = 1
- THEN qi.unqualified_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
- THEN qi.qualified_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 quality_inspect qi
-
- GROUP BY qi.inspect_type
- ORDER BY qi.inspect_type;
+ /* 鍚堟牸鐜囷細
+ 濡傛灉瀹屽伐鏁颁负 0 鍒欒繑鍥� 0锛涗娇鐢� TRUNCATE 鎴柇锛岄槻姝㈡瀬鍏舵帴杩� 100% 鐨勬暟鎹鍥涜垗浜斿叆鎴� 100
+ */
+ IF(t.completedCount = 0, 0,
+ TRUNCATE((t.qualifiedCount / t.completedCount) * 100, 2)
+ ) AS passRate
+ FROM (
+ /* 鍏堥�氳繃瀛愭煡璇㈡妸鍩虹鏁版嵁杩涜鑱氬悎缁熻锛岄伩鍏嶅灞傞噸澶嶇紪鍐欏鏉傜殑 CASE WHEN */
+ SELECT qi.inspect_type AS 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 THEN qi.qualified_quantity ELSE 0 END),
+ 0) AS qualifiedCount,
+ COALESCE(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.unqualified_quantity ELSE 0 END),
+ 0) AS unqualifiedCount
+ FROM quality_inspect qi
+ GROUP BY qi.inspect_type) t
+ ORDER BY t.modelType;
</select>
@@ -196,88 +161,52 @@
FROM months m
CROSS JOIN types t)
- SELECT CASE b.month_num
- WHEN 1 THEN '涓�鏈�'
- WHEN 2 THEN '浜屾湀'
- WHEN 3 THEN '涓夋湀'
- WHEN 4 THEN '鍥涙湀'
- WHEN 5 THEN '浜旀湀'
- WHEN 6 THEN '鍏湀'
- WHEN 7 THEN '涓冩湀'
- WHEN 8 THEN '鍏湀'
- WHEN 9 THEN '涔濇湀'
- WHEN 10 THEN '鍗佹湀'
- WHEN 11 THEN '鍗佷竴鏈�'
- WHEN 12 THEN '鍗佷簩鏈�'
- END AS month,
+ SELECT
+ CASE t.month_num
+ WHEN 1 THEN '涓�鏈�'
+ WHEN 2 THEN '浜屾湀'
+ WHEN 3 THEN '涓夋湀'
+ WHEN 4 THEN '鍥涙湀'
+ WHEN 5 THEN '浜旀湀'
+ WHEN 6 THEN '鍏湀'
+ WHEN 7 THEN '涓冩湀'
+ WHEN 8 THEN '鍏湀'
+ WHEN 9 THEN '涔濇湀'
+ WHEN 10 THEN '鍗佹湀'
+ WHEN 11 THEN '鍗佷竴鏈�'
+ WHEN 12 THEN '鍗佷簩鏈�'
+ END AS month,
- b.modelType,
+ t.modelType,
+ t.totalCount,
+ t.completedCount,
+ t.qualifiedCount,
+ t.unqualifiedCount,
- /* 鎬绘暟閲� */
- COALESCE(SUM(qi.quantity), 0) AS totalCount,
+ IF(t.totalCount = 0, 0,
+ TRUNCATE((t.completedCount / t.totalCount) * 100, 2)
+ ) AS completionRate,
- /* 宸插畬鎴� */
- COALESCE(SUM(
- CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END
- ), 0) AS completedCount,
+ IF(t.completedCount = 0, 0,
+ TRUNCATE((t.qualifiedCount / t.completedCount) * 100, 2)
+ ) AS passRate
- /* 鍚堟牸 */
- COALESCE(SUM(
- CASE
- WHEN qi.inspect_state = 1
- THEN qi.qualified_quantity
- ELSE 0
- END
- ), 0) AS qualifiedCount,
-
- /* 涓嶅悎鏍� */
- COALESCE(SUM(
- CASE
- WHEN qi.inspect_state = 1
- THEN qi.unqualified_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
- THEN qi.qualified_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 quality_inspect qi
- ON qi.inspect_type = b.modelType
- 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;
-
+ FROM (
+ SELECT
+ b.month_num,
+ 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 THEN qi.qualified_quantity ELSE 0 END), 0) AS qualifiedCount,
+ COALESCE(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.unqualified_quantity ELSE 0 END), 0) AS unqualifiedCount
+ FROM base b
+ LEFT JOIN quality_inspect qi ON qi.inspect_type = b.modelType
+ AND YEAR(qi.check_time) = #{year}
+ AND MONTH(qi.check_time) = b.month_num
+ GROUP BY b.month_num, b.modelType
+ ) t
+ ORDER BY t.month_num, t.modelType;
</select>
-
<select id="getYearlyPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityPassRateDto">
SELECT qi.inspect_type AS modelType,
--
Gitblit v1.9.3