From 5d86ffe662c0472a96bcccee2da307461c115de0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 29 八月 2023 17:55:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 3ce5aec..45753e2 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -2,14 +2,15 @@
<!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">
<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>
@@ -25,7 +26,8 @@
</select>
<select id="selectLinkAll" resultType="java.util.Map">
- SELECT 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,
@@ -39,5 +41,52 @@
lims_laboratory.link_detection d
WHERE l.`id` = d.`link_basic_id`
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.uid uid,
+ ld.id id,
+ ld.sample_number sampleNumber,
+ ld.sample_name sampleName,
+ ld.specifications_models specificationsModels,
+ ld.unit unit,
+ ld.samples_number samplesNumber,
+ ld.remarks remarks
+ FROM link_basic_information lb,
+ link_detection ld
+ WHERE lb.id = ld.link_basic_id
+ AND 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="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"/>
+ <collection property="linkDetectionList" ofType="LinkDetection">
+ <result property="id" column="id"/>
+ <result property="sampleNumber" column="sampleNumber"/>
+ <result property="specificationsModels" column="specificationsModels"/>
+ <result property="unit" column="unit"/>
+ <result property="samplesNumber" column="samplesNumber"/>
+ <result property="remarks" column="remarks"/>
+ </collection>
+ </resultMap>
</mapper>
--
Gitblit v1.9.3