From d2ce4553e18131b9a60d7be53c496f0cbce699ca Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 08 九月 2023 14:47:47 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 65882eb..58bf6cb 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -6,13 +6,15 @@
</delete>
<select id="getLinkBasicPage" resultType="map">
SELECT d.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
- d.`specifications_models`,
+ s.name specifications_models,
+ d.spe_name speName,
DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, DATE_FORMAT(l.`completion_deadline`,'%Y-%m-%d')
completionDeadline, l.`contacts`,
DATE_FORMAT(d.`date_survey`,'%Y-%m-%d') dateSurvey, d.`inspection_status`,
DATE_FORMAT(l.`ins_time`,'%Y-%m-%d') insTime
- FROM link_basic_information l, link_detection d
+ FROM link_basic_information l, link_detection d,specifications s
WHERE l.`id` = d.`link_basic_id`
+ and s.id=d.`specifications_models`
AND d.`state` = 1
and l.`state` = 1
<if test="entrustCoding != null and entrustCoding != null">
@@ -38,6 +40,7 @@
d.`specifications_models` specifications,
d.`unit`,
d.`samples_number` num,
+ d.specifications_models specificationsId,
experiment,
DATE_FORMAT(date_survey, '%Y-%m-%d') startTime,
DATE_FORMAT(completion_deadline, '%Y-%m-%d') endTime
@@ -66,11 +69,15 @@
ld.sample_name sampleName,
ld.specifications_models specificationsModels,
ld.unit unit,
+ ld.experiment experiment,
ld.samples_number samplesNumber,
- ld.remarks remarks
+ ld.remarks remarks,
+ ld.spe_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>
@@ -97,6 +104,8 @@
<result property="unit" column="unit"/>
<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