From 17ea3e9ec4f49b3652ff8a1e7dc9af502503d3f0 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 13:30:02 +0800
Subject: [PATCH] 成品下单查询拼接检验人
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 79 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index bc998cb..24c7c12 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -58,49 +58,60 @@
CONCAT(ROUND(approved_product_counts.approved_count / total_product_counts.total_count * 100, 2), '%') AS insProgress,
io.sample_view AS sample_name,
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
+ GROUP_CONCAT(DISTINCT uu.name SEPARATOR ', ') AS testing_name,
u.name,
- testing_name,
ip.son_laboratory
FROM
- ins_order io
+ ins_order io
+ LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id
+ LEFT JOIN ins_product ip on ip.ins_sample_id = isa.id
+ LEFT JOIN ins_sample_user isau ON isau.ins_sample_id = io.id
+ LEFT JOIN (SELECT id, ins_order_id, is_ratify, url, url_s FROM ins_report WHERE is_ratify = 1) ir ON io.id = ir.ins_order_id
+ LEFT JOIN user u ON io.create_user = u.id
+ LEFT JOIN user uu ON ip.check_user_id = uu.id
LEFT JOIN
- ins_sample isa ON io.id = isa.ins_order_id
- left join ins_product ip on ip.ins_sample_id = isa.id
+ (SELECT ins_order_id, COUNT(*) AS sample_num
+ FROM ins_sample
+ WHERE id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s )
+ GROUP BY ins_order_id
+ ) sample_counts ON io.id = sample_counts.ins_order_id
LEFT JOIN
- ins_sample_user isau ON isau.ins_sample_id = io.id
+ (SELECT ins_sample.ins_order_id, COUNT(*) AS total_count
+ FROM ins_product
+ JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
+ WHERE ins_product.state = 1
+ GROUP BY ins_sample.ins_order_id
+ ) total_product_counts ON io.id = total_product_counts.ins_order_id
LEFT JOIN
- (SELECT id, ins_order_id, is_ratify, url, url_s FROM ins_report WHERE is_ratify = 1) ir ON io.id = ir.ins_order_id
- LEFT JOIN
- user u ON io.create_user = u.id
- LEFT JOIN
- (SELECT ins_order_id, COUNT(*) AS sample_num
- FROM ins_sample
- WHERE id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s )
- GROUP BY ins_order_id) sample_counts ON io.id = sample_counts.ins_order_id
- LEFT JOIN
- (SELECT ins_sample.ins_order_id, COUNT(*) AS total_count
- FROM ins_product
- JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
- WHERE ins_product.state = 1
- GROUP BY ins_sample.ins_order_id) total_product_counts ON io.id = total_product_counts.ins_order_id
- LEFT JOIN
- (SELECT ins_sample.ins_order_id, COUNT(*) AS approved_count
- FROM ins_product
- JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
- WHERE ins_product.state = 1 AND ins_product.ins_result IS NOT NULL
- GROUP BY ins_sample.ins_order_id) approved_product_counts ON io.id = approved_product_counts.ins_order_id
- LEFT JOIN (SELECT ins_sample_id, GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS testing_name
- FROM ins_sample_user u
- LEFT JOIN user uu ON u.user_id = uu.id
- WHERE u.state = 0
- GROUP BY ins_sample_id
- ORDER BY ins_sample_id) isu ON isu.ins_sample_id = io.id
+ (SELECT ins_sample.ins_order_id, COUNT(*) AS approved_count
+ FROM ins_product
+ JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
+ WHERE ins_product.state = 1 AND ins_product.ins_result IS NOT NULL
+ GROUP BY ins_sample.ins_order_id
+ ) approved_product_counts ON io.id = approved_product_counts.ins_order_id
where (io.ifs_inventory_id IS NULL OR TRIM(io.ifs_inventory_id) = '')
- <if test="isOrderAll != null and isOrderAll != ''">
+ <if test="otherParam.isOrderAll != null and otherParam.isOrderAll != ''">
AND io.state in (1, 4)
</if>
- <if test="laboratory!=null and laboratory!=''">
- AND io.laboratory=#{laboratory}
+ <if test="otherParam.laboratory!=null and otherParam.laboratory!=''">
+ AND io.laboratory=#{otherParam.laboratory}
+ </if>
+ <if test="otherParam.checkUserFlag != null and otherParam.checkUserFlag and otherParam.checkUserId != null ">
+ AND io.id IN (
+ SELECT DISTINCT
+ ins_sample_id AS orderId
+ FROM
+ ins_sample_user
+ WHERE
+ user_id = #{otherParam.checkUserId} UNION
+ SELECT
+ T2.ins_order_id AS orderId
+ FROM
+ ins_product T1
+ JOIN ins_sample T2 ON T1.ins_sample_id = T2.id
+ WHERE
+ T1.check_user_id = #{otherParam.checkUserId}
+ )
</if>
GROUP BY io.id,type
order by type desc,io.id desc
--
Gitblit v1.9.3