From 73507854f0618fe7f96c93aa64b870ff9c44664a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 07 六月 2024 10:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 57bb691..d5affd3 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -102,12 +102,14 @@
where ios2.ins_order_id = io.id) * 100, 2), '%') insProgress,
group_concat(distinct isa.sample_code,' ') sample_code,
group_concat(distinct isa.sample,' ') sample_name,
- group_concat(distinct isa.model,' ') sample_model
+ group_concat(distinct isa.model,' ') sample_model,
+ u.name
FROM
ins_order io
LEFT JOIN ins_sample isa ON io.id = isa.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
GROUP BY
io.id
) a
--
Gitblit v1.9.3