From 6236dc086ca06533acbd7a1d6f45d7b9d0ae38aa Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 11:41:01 +0800
Subject: [PATCH] 修改委托单位
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 65882eb..0896c63 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -6,13 +6,14 @@
</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,
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">
@@ -66,6 +67,7 @@
ld.sample_name sampleName,
ld.specifications_models specificationsModels,
ld.unit unit,
+ ld.experiment experiment,
ld.samples_number samplesNumber,
ld.remarks remarks
FROM link_basic_information lb left join
@@ -97,6 +99,7 @@
<result property="unit" column="unit"/>
<result property="samplesNumber" column="samplesNumber"/>
<result property="remarks" column="remarks"/>
+ <result property="experiment" column="experiment"/>
</collection>
</resultMap>
</mapper>
--
Gitblit v1.9.3