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 | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 808e473..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>
--
Gitblit v1.9.3