From d9505757da1a789c4bb9f7c05e8bfd1f09b77ba1 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 28 八月 2023 09:25:33 +0800
Subject: [PATCH] 修改报告预览数据接口

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

diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 2acf86f..619b044 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -25,19 +25,21 @@
     </select>
 
     <select id="selectLinkAll" resultType="java.util.Map">
-        SELECT DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d')  formTime,
-               l.`entrusted` supplier,
-               d.`sample_number` mcode,
-               d.`sample_name` name,
-               d.`specifications_models` specifications,
+        SELECT d.id ,
+            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.`unit`,
-               d.`samples_number` num,
-               DATE_FORMAT(date_survey,'%Y-%m-%d')  startTime,
-               DATE_FORMAT(completion_deadline,'%Y-%m-%d') endTime
+               d.`samples_number`                           num,
+               experiment,
+               DATE_FORMAT(date_survey, '%Y-%m-%d')         startTime,
+               DATE_FORMAT(completion_deadline, '%Y-%m-%d') endTime
         FROM lims_laboratory.link_basic_information l,
              lims_laboratory.link_detection d
         WHERE l.`id` = d.`link_basic_id`
           AND l.`state` = 1
+          and inspection_status = 1
     </select>
-
 </mapper>

--
Gitblit v1.9.3