From ac2ee2bbf5993c2e5aa009049c9444c226960caa Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 15:16:18 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-19
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 7751861..8d9790a 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -4,7 +4,8 @@
<select id="getLinkBasicPage" resultType="map">
SELECT l.`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') inspectionTime, l.`contacts`, d.`date_survey`, d.`inspection_status`
+ 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
@@ -15,10 +16,39 @@
AND d.`sample_name` like concat('%', #{sampleName}, '%')
</if>
<if test="entrusted != null and entrusted != null">
- AND l.`contacts` like concat('%', #{entrusted}, '%')
+ AND l.`entrusted` like concat('%', #{entrusted}, '%')
</if>
<if test="inspectionStatus != null and inspectionStatus != null">
AND d.`inspection_status` = #{inspectionStatus}
</if>
</select>
+
+ <select id="selectLinkAll" resultType="java.util.Map">
+ SELECT l.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`, d.`specifications_models`,
+ DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, l.`completion_deadline`, l.`contacts`, d.`date_survey`, d.`inspection_status`
+ FROM lims_laboratory.link_basic_information l, lims_laboratory.link_detection d
+ WHERE l.`id` = d.`link_basic_id`
+ AND l.`state` = 1
+ </select>
+
+ <select id="selectLinkByid" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionVo">
+ SELECT l.`inspection_time` formTime,
+ l.`entrusted` supplier,
+ d.`sample_number` mcode,
+ d.`sample_name` name,
+ d.`specifications_models` specifications,
+ d.`unit`,
+ d.`samples_number` num,
+ d.date_survey startTime,
+ l.completion_deadline endTime
+ FROM lims_laboratory.link_basic_information l, lims_laboratory.link_detection d
+ WHERE l.`id` = d.`link_basic_id`
+ AND l.`state` = 1
+ <if test="bid!=null">
+ and l.id=#{bid}
+ </if>
+ <if test="did!=null">
+ and d.id=#{did}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3