From 464043930df178727b357e2b31b4e5f19e1e17a8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 10:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 45753e2..8d5b574 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -1,12 +1,16 @@
<?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 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`
+ 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
@@ -54,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,
@@ -62,27 +68,32 @@
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">
<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"/>
--
Gitblit v1.9.3