From 6236d3f2ade69cfea844b1cfdd7622909dd42026 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 29 八月 2023 17:54:22 +0800
Subject: [PATCH] 删除委托报检(样品)
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 456ca9e..36ec1c1 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>
@@ -17,7 +18,7 @@
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}
@@ -25,19 +26,21 @@
</select>
<select id="selectLinkAll" resultType="java.util.Map">
- SELECT DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') formTime,
- l.`entrusted` supplier,
- d.`sample_number` mcode,
- d.`sample_name` name,
- d.`specifications_models` specifications,
+ SELECT d.id ,
+ DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
+ l.`entrusted` supplier,
+ d.`sample_number` mcode,
+ d.`sample_name` name,
+ d.`specifications_models` specifications,
d.`unit`,
- d.`samples_number` num,
- DATE_FORMAT(date_survey,'%Y-%m-%d') startTime,
- DATE_FORMAT(completion_deadline,'%Y-%m-%d') endTime
+ d.`samples_number` num,
+ experiment,
+ DATE_FORMAT(date_survey, '%Y-%m-%d') startTime,
+ DATE_FORMAT(completion_deadline, '%Y-%m-%d') endTime
FROM lims_laboratory.link_basic_information l,
lims_laboratory.link_detection d
WHERE l.`id` = d.`link_basic_id`
AND l.`state` = 1
+ and inspection_status = 1
</select>
-
</mapper>
--
Gitblit v1.9.3