From 99cf848f87e2e06954d1ca101c9ff1879cf801c7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 五月 2025 15:15:45 +0800
Subject: [PATCH] 远场上传的文件解析调整+检验任务样品编号筛选
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index cfae4bb..d573263 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -29,6 +29,7 @@
SELECT
a.*,
ios.ins_state,
+ ios.is_out,
ios.laboratory son_laboratory,
ios.verify_tell,
verify_user,
@@ -53,7 +54,7 @@
io.send_time,
isa.id sampleId,
isa.sample sample,
- isa.sample_code sampleCode,
+ isa.sample_code ,
userName,
userNameId,
checkName,
@@ -80,6 +81,9 @@
ORDER BY ins_sample_id
)isu2 ON isu2.ins_sample_id = isa.id
WHERE io.state = 1 and send_time is not null
+ <if test="sampleCode !=null and sampleCode!=''">
+ and (isa.sample_code like CONCAT ('%', #{sampleCode},'%') )
+ </if>
<if test="userName !=null and userName!=''">
and ( (userName like CONCAT ('%', #{userName},'%') )
or (checkName like CONCAT ('%', #{userName},'%') ) )
@@ -94,6 +98,7 @@
ios.create_time
) b
where ins_state is not null
+ and (is_out is null or is_out !=1)
and son_laboratory=#{sonLaboratory}
and state =1
<if test="laboratory!=null and laboratory!=''">
--
Gitblit v1.9.3