From 8abe275e36823f1065300af45e1f7a9a68f549a7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 06 九月 2023 16:14:40 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 45753e2..58bf6cb 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -1,14 +1,20 @@
<?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`,
+ s.name specifications_models,
+ d.spe_name speName,
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
+ 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,specifications s
WHERE l.`id` = d.`link_basic_id`
+ and s.id=d.`specifications_models`
AND d.`state` = 1
and l.`state` = 1
<if test="entrustCoding != null and entrustCoding != null">
@@ -34,6 +40,7 @@
d.`specifications_models` specifications,
d.`unit`,
d.`samples_number` num,
+ d.specifications_models specificationsId,
experiment,
DATE_FORMAT(date_survey, '%Y-%m-%d') startTime,
DATE_FORMAT(completion_deadline, '%Y-%m-%d') endTime
@@ -54,20 +61,25 @@
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,
ld.sample_name sampleName,
ld.specifications_models specificationsModels,
ld.unit unit,
+ ld.experiment experiment,
ld.samples_number samplesNumber,
- ld.remarks remarks
- FROM link_basic_information lb,
+ ld.remarks remarks,
+ ld.spe_name speName
+ 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
+ left join specifications s
+ on ld.specifications_models = s.id
+ where lb.uid = #{uid}
and lb.state = 1
- AND ld.state = 1
</select>
<resultMap id="getLinkBasicInformationMap" type="com.yuanchu.limslaboratory.pojo.LinkBasicInformation">
@@ -80,13 +92,20 @@
<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"/>
<result property="remarks" column="remarks"/>
+ <result property="experiment" column="experiment"/>
+ <result property="speName" column="speName"/>
</collection>
</resultMap>
</mapper>
--
Gitblit v1.9.3