From 19c9e29273e8e751847d9dcb06b346dede48d2c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 0896c63..8a857a0 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -69,10 +69,13 @@
ld.unit unit,
ld.experiment experiment,
ld.samples_number samplesNumber,
- ld.remarks remarks
+ ld.remarks remarks,
+ s.name speName
FROM link_basic_information lb left join
link_detection ld
on lb.id = ld.link_basic_id
+ left join specifications s
+ on ld.specifications_models = s.id
where lb.uid = #{uid}
and lb.state = 1
</select>
@@ -100,6 +103,7 @@
<result property="samplesNumber" column="samplesNumber"/>
<result property="remarks" column="remarks"/>
<result property="experiment" column="experiment"/>
+ <result property="speName" column="speName"/>
</collection>
</resultMap>
</mapper>
--
Gitblit v1.9.3