From 544afa4dabaccb0248bf0b6fcfdc7b9b6c2ea9f2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 13 一月 2026 17:56:38 +0800
Subject: [PATCH] 合格率统计重构:根据物料属性分类返回对应的合格/不合格数据量

---
 inspect-server/src/main/resources/mapper/InsOrderMapper.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 18f7a41..7e3191d 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -326,6 +326,7 @@
         ORDER BY COUNT(*) DESC
         LIMIT 1;
     </select>
+
     <select id="selectSampleCableTag" resultType="java.lang.String">
         SELECT ip.cable_tag
         FROM ins_sample isa
@@ -333,10 +334,11 @@
                  LEFT JOIN ins_product ip ON isa.id = ip.ins_sample_id
         WHERE ip.state = 1
           AND isa.id = #{id}
-          and ip.cable_tag is not null
+          AND ip.cable_tag IS NOT NULL
         GROUP BY ip.cable_tag
-        order by ip.cable_tag
+        ORDER BY MIN(ip.id)
     </select>
+
     <select id="selectSampleItemS" resultType="java.lang.Integer">
         select count(*)
         from (select distinct ip.inspection_item
@@ -415,13 +417,13 @@
         iiq.part_desc,
         iiq.lot_batch_no,
         iiq.part_no,
+        iiq.inspect_status as ins_state,
         ippr.insulation_color,
         ippr.outer_color,
         ippr.drum_no,
         ippr.start_meter_mark,
         ippr.end_meter_mark,
         io.update_time,
-        io.ins_state,
         -- 妫�楠屼汉鏌ヨ锛氫紭鍏堝彇鎸囨淳鐨勮礋璐d汉锛屽鏋滄病鏈夊垯鍙栬鍗曞垱寤轰汉
         COALESCE(isu.userName, u.name) AS inspector_name
         FROM ifs_inventory_quantity iiq

--
Gitblit v1.9.3