From 3b4f477036ac560386b66dc213fde94386a0345d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 10:33:51 +0800
Subject: [PATCH] 修改委托单位
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 9941c89..edb2587 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -9,7 +9,8 @@
d.`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(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
WHERE l.`id` = d.`link_basic_id`
AND d.`state` = 1
@@ -57,12 +58,15 @@
lb.sample_delivery_phone sampleDeliveryPhone,
lb.report_number reportNumber,
lb.entrust_remarks entrustRemarks,
+ lb.sample_sender sampleSender,
+ lb.entrusted entrusted,
lb.uid uid,
ld.id id,
ld.sample_number sampleNumber,
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
@@ -76,20 +80,25 @@
<result property="entrustCoding" column="entrustCoding"/>
<result property="contacts" column="contacts"/>
<result property="contactNumber" column="contactNumber"/>
- <result property="entrusted" column="entrusted"/>
<result property="contactAddress" column="contactAddress"/>
<result property="uid" column="uid"/>
<result property="completionDeadline" column="completionDeadline"/>
<result property="inspectionTime" column="inspectionTime"/>
<result property="sampleDeliveryMode" column="sampleDeliveryMode"/>
<result property="sampleDeliveryPhone" column="sampleDeliveryPhone"/>
+ <result property="sampleSender" column="sampleSender"/>
+ <result property="entrustRemarks" column="entrustRemarks"/>
+ <result property="reportNumber" column="reportNumber"/>
+ <result property="entrusted" column="entrusted"/>
<collection property="linkDetectionList" ofType="LinkDetection">
<result property="id" column="id"/>
<result property="sampleNumber" column="sampleNumber"/>
+ <result property="sampleName" column="sampleName"/>
<result property="specificationsModels" column="specificationsModels"/>
<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