From 730443b70de88d328ffa275f51f69280fda979e4 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 12:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 619b044..0896c63 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -1,15 +1,21 @@
<?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`,
- d.`specifications_models`,
+ SELECT d.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
+ s.name 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
+ 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 l.`state` = 1
+ and s.id=d.`specifications_models`
+ AND d.`state` = 1
+ and l.`state` = 1
<if test="entrustCoding != null and entrustCoding != null">
AND l.`entrust_coding` like concat('%', #{entrustCoding}, '%')
</if>
@@ -25,8 +31,8 @@
</select>
<select id="selectLinkAll" resultType="java.util.Map">
- SELECT d.id ,
- DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
+ SELECT d.id,
+ DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
l.`entrusted` supplier,
d.`sample_number` mcode,
d.`sample_name` name,
@@ -42,4 +48,58 @@
AND l.`state` = 1
and inspection_status = 1
</select>
+ <select id="getLinkBasicInformation" resultMap="getLinkBasicInformationMap">
+ SELECT lb.entrust_coding entrustCoding,
+ lb.contacts contacts,
+ lb.contact_number contactNumber,
+ lb.contact_address contactAddress,
+ lb.completion_deadline completionDeadline,
+ lb.inspection_time inspectionTime,
+ lb.sample_delivery_mode sampleDeliveryMode,
+ 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 left join
+ link_detection ld
+ on lb.id = ld.link_basic_id
+ where lb.uid = #{uid}
+ and lb.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="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"/>
+ <result property="remarks" column="remarks"/>
+ <result property="experiment" column="experiment"/>
+ </collection>
+ </resultMap>
</mapper>
--
Gitblit v1.9.3