From 6cd215389e72e5c12be9e5ee124b470b9d620f4d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 10:09:30 +0800
Subject: [PATCH] 修改委托单位

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

diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 808e473..694d9fd 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper">
+    <delete id="deleteByID">
+        delete from link_basic_information where id=#{id}
+    </delete>
     <select id="getLinkBasicPage" resultType="map">
-        SELECT l.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
+        SELECT d.`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')
         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
+        AND d.`state` = 1
+        and l.`state` = 1
         <if test="entrustCoding != null and entrustCoding != null">
             AND l.`entrust_coding` like concat('%', #{entrustCoding}, '%')
         </if>
@@ -61,12 +65,11 @@
                ld.unit                  unit,
                ld.samples_number        samplesNumber,
                ld.remarks               remarks
-        FROM link_basic_information lb,
+        FROM link_basic_information lb left join
              link_detection ld
-        WHERE lb.id = ld.link_basic_id
-          AND lb.uid = #{uid}
+             on lb.id = ld.link_basic_id
+        where lb.uid = #{uid}
           and lb.state = 1
-          AND ld.state = 1
     </select>
 
     <resultMap id="getLinkBasicInformationMap" type="com.yuanchu.limslaboratory.pojo.LinkBasicInformation">

--
Gitblit v1.9.3