From f2aec44685466b0c514bffa7db4a2d0db1a7f28c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 08 五月 2024 11:26:37 +0800
Subject: [PATCH] 2024-5-8 绩效管理-班次后端开发完成

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

diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 26a04a3..8397556 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -95,7 +95,10 @@
         ir.id report_id,
         concat(ROUND((select count(*) from ins_sample isa2
         where ins_state = 5 and isa2.ins_order_id = io.id) / (select count(*) from ins_sample isa2
-        where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress
+        where isa2.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
         FROM
         ins_order io
         LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id

--
Gitblit v1.9.3