From 169f2ae1155f62bbd529dba27fdc19d653906175 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 11 May 2022 17:24:57 +0800
Subject: [PATCH] sout删除一部分
---
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 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 373fdbb..a843b61 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
+ left 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
+ left 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>
@@ -205,6 +205,35 @@
</if>
</select>
+
+ <select id="getOpeReagentStatusList22" parameterType="java.util.Map" resultMap="OpeReagentStatus">
+ <include refid="queryColumns"/>
+ from ope_reagent_status as oa
+ left join sys_reagent sr on oa.reagent_id = sr.id
+ left join sys_supplier as ss on sr.supplier_id = ss.id
+ left join sys_user as su on oa.user_id = su.id
+
+ <if test="status != null">
+ <choose>
+ <when test="status == 1">
+ 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">
+ 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>
+ </if>
+ where oa.valid_flag = 1
+ <include refid="queryWhereSql"/>
+
+ order by oa.reagent_code asc
+ <if test="first != null and pageSize != null">
+ limit #{first}, #{pageSize}
+ </if>
+ </select>
+
<select id="getOpeReagentStatusListForLab" parameterType="java.util.Map" resultMap="OpeReagentStatus">
select oa.*,
sr.*,
--
Gitblit v1.9.2