From 25eca015c9edb5a8ab3fd9d68a8fd785619c1372 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 28 二月 2022 11:24:48 +0800
Subject: [PATCH] 仓库状态温湿度阈值警报字段
---
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 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 57cb6b2..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>
@@ -204,6 +204,35 @@
limit #{first}, #{pageSize}
</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.*,
@@ -639,4 +668,12 @@
</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