From d2f503f72b5485bfee54ea296c7d0a9a243cea02 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 14 一月 2026 17:51:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns
---
inspect-server/src/main/resources/mapper/DataAnalysisMapper.xml | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/DataAnalysisMapper.xml b/inspect-server/src/main/resources/mapper/DataAnalysisMapper.xml
index 3c19453..749041b 100644
--- a/inspect-server/src/main/resources/mapper/DataAnalysisMapper.xml
+++ b/inspect-server/src/main/resources/mapper/DataAnalysisMapper.xml
@@ -241,17 +241,18 @@
<select id="getMaterialPropTable" resultType="com.ruoyi.inspect.dto.MaterialPropTableDTO">
SELECT
- iiq.update_batch_no AS updateBatchNo, -- 淇敼鍚庢壒娆″彿
- iiq.qty_arrived AS qtyArrived, -- 鎶佃揪鐨勯噰璐暟閲�
- iiq.part_desc AS partDesc, -- 闆朵欢鎻忚堪
- iiq.inspect_status AS inspectStatus, -- 鍚堟牸鐘舵��
- io1.send_time AS sendTime -- 涓嬪彂鏃堕棿
+ iiq.supplier_name AS supplierName,
+ COUNT(*) AS totalBatch,
+ SUM(CASE WHEN iiq.inspect_status = 2 THEN 1 ELSE 0 END) AS unqualifiedBatch,
+ ROUND(SUM(CASE WHEN iiq.inspect_status = 1 THEN 1 ELSE 0 END) / COUNT(*)* 100, 2 ) AS passRate
+
FROM ifs_inventory_quantity iiq
INNER JOIN ins_order io1
ON io1.ifs_inventory_id = iiq.id
AND io1.order_type = #{dto.orderType}
AND io1.state != -1
AND io1.send_time BETWEEN #{dto.beginDate} AND #{dto.endDate}
+
LEFT JOIN (
SELECT
ins_order_id,
@@ -260,6 +261,7 @@
FROM ins_sample
GROUP BY ins_order_id
) ins ON ins.ins_order_id = io1.id
+
WHERE
iiq.is_finish = 1
AND iiq.inspect_status IN (1,2)
@@ -280,7 +282,12 @@
AND IFNULL(iiq.supplier_name,'') LIKE CONCAT('%',#{dto.supplierName},'%')
</if>
- ORDER BY io1.send_time DESC
+ GROUP BY
+ iiq.supplier_name
+
+ ORDER BY
+ passRate DESC;
+
</select>
<select id="getRawProductAnalysisAllSample" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
--
Gitblit v1.9.3