From 76c806e5ca84d7411b67ee3d6047cfc1454da8f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 04 八月 2024 23:01:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/StructureTestMapper.xml | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/StructureTestMapper.xml b/cnas-server/src/main/resources/mapper/StructureTestMapper.xml
index 46da112..7fc7fdc 100644
--- a/cnas-server/src/main/resources/mapper/StructureTestMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureTestMapper.xml
@@ -5,15 +5,23 @@
<mapper namespace="com.yuanchu.mom.mapper.StructureTestObjectMapper">
<select id="selectTestObjectList" resultType="com.yuanchu.mom.dto.PageTestObjectDto">
+ select * from (
select sto.id,
- sto.specimen_name,
- u1.name createUserName,
- sto.create_time,
- u2.name updateUserName,
- sto.update_time
+ sto.specimen_name,
+ u1.name create_user_name,
+ sto.create_time,
+ u2.name update_user_name,
+ sto.update_time,
+ sto.code,
+ sto.laboratory_id,
+ GROUP_CONCAT(p.name) product,
+ sto.specimen_name_en
from structure_test_object sto
- left join user u1 on sto.create_user = u1.id
- left join user u2 on sto.update_user = u2.id
+ left join user u1 on sto.create_user = u1.id
+ left join user u2 on sto.update_user = u2.id
+ left join product p on p.object_id = sto.id
+ group by sto.id
+ ) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3