From f0a9d5348d12bf7f73021855dd85ecb687f8412e Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 30 十二月 2021 12:47:05 +0800
Subject: [PATCH] bug
---
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
index ca34508..4ac562d 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
@@ -145,11 +145,11 @@
<if test="status != null">
<choose>
<when test="status == 1">
- left join sys_warehouse as sw on sw.id = oa.house_id
+ inner join sys_warehouse as sw on sw.id = oa.house_id
left join sys_warehouse_container as swc on swc.id = oa.container_id
</when>
<when test="status == 2">
- left join sys_laboratory as sw on sw.id = oa.house_id
+ inner join sys_laboratory as sw on sw.id = oa.house_id
left join sys_laboratory_container as swc on swc.id = oa.container_id
</when>
</choose>
@@ -270,6 +270,9 @@
<when test="status == 2 and project != null and project != ''">
and sw.project like concat("%",#{project},"%")
</when>
+ <when test="status == 2 and labName != null and labName != ''">
+ and sw.name like concat("%",#{labName},"%")
+ </when>
</choose>
order by oa.reagent_code asc
<if test="first != null and pageSize != null">
@@ -360,6 +363,9 @@
<when test="status == 2 and project != null and project != ''">
and sw.project like concat("%",#{project},"%")
</when>
+ <when test="status == 2 and labName != null and labName != ''">
+ and sw.name like concat("%",#{labName},"%")
+ </when>
</choose>
</select>
@@ -627,7 +633,18 @@
<when test="status == 2 and project != null and project != ''">
and sw.project like concat("%",#{project},"%")
</when>
+ <when test="status == 2 and labName != null and labName != ''">
+ and sw.name like concat("%",#{labName},"%")
+ </when>
</choose>
order by oa.reagent_code asc
</select>
+ <select id="getStatus" resultMap="OpeReagentStatus">
+
+ select *
+ from ope_reagent_status
+ where valid_flag = 1
+ and reagent_code = #{reagentCode}
+ and reagent_id = #{reagentId}
+ </select>
</mapper>
--
Gitblit v1.9.2