From c9863cfd3316437dd674d79a455aa18cd7dd1eb1 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 13:36:11 +0800
Subject: [PATCH] 测试

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

diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 7751861..ab4c4eb 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -4,7 +4,8 @@
 
     <select id="getLinkBasicPage" resultType="map">
         SELECT l.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`, d.`specifications_models`,
-            DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, DATE_FORMAT(l.`completion_deadline`,'%Y-%m-%d') inspectionTime, l.`contacts`, d.`date_survey`, d.`inspection_status`
+            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`
         FROM link_basic_information l, link_detection d
         WHERE l.`id` = d.`link_basic_id`
         AND l.`state` = 1
@@ -21,4 +22,33 @@
             AND d.`inspection_status` = #{inspectionStatus}
         </if>
     </select>
+
+    <select id="selectLinkAll" resultType="java.util.Map">
+        SELECT l.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`, d.`specifications_models`,
+        DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, l.`completion_deadline`, l.`contacts`, d.`date_survey`, d.`inspection_status`
+        FROM lims_laboratory.link_basic_information l, lims_laboratory.link_detection d
+        WHERE l.`id` = d.`link_basic_id`
+        AND l.`state` = 1
+    </select>
+
+    <select id="selectLinkByid" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionVo">
+        SELECT l.`inspection_time` formTime,
+        l.`entrusted` supplier,
+        d.`sample_number` mcode,
+        d.`sample_name` name,
+        d.`specifications_models` specifications,
+        d.`unit`,
+        d.`samples_number` num,
+        d.date_survey startTime,
+        l.completion_deadline endTime
+        FROM lims_laboratory.link_basic_information l, lims_laboratory.link_detection d
+        WHERE l.`id` = d.`link_basic_id`
+          AND l.`state` = 1
+        <if test="bid!=null">
+            and l.id=#{bid}
+        </if>
+        <if test="did!=null">
+            and d.id=#{did}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3