From e7f7daae5d21ad2988cadd25b6987ca5e7ef8001 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 09:51:20 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 0896c63..a7ad0c4 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -7,6 +7,7 @@
<select id="getLinkBasicPage" resultType="map">
SELECT d.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
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`,
@@ -32,13 +33,15 @@
<select id="selectLinkAll" resultType="java.util.Map">
SELECT d.id,
+ l.entrust_coding entrustCoding,
DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
l.`entrusted` supplier,
d.`sample_number` mcode,
d.`sample_name` name,
- d.`specifications_models` specifications,
+ d.`spe_name` 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
@@ -69,10 +72,13 @@
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>
@@ -100,6 +106,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