From cdb1c35699da755588ab70ec8e122ae256570305 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 10:11:06 +0800
Subject: [PATCH] 修改bug

---
 inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 694d9fd..65882eb 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,6 +58,8 @@
                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,
@@ -82,9 +85,14 @@
         <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"/>

--
Gitblit v1.9.3