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/OpeUseFlowDao.xml | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index 0a2d528..0290112 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -52,6 +52,7 @@
<update id="updateReceiptNumber">
update ope_use_flow
set receipt_number = #{1}
+ , note = #{2}
where reagent_code = #{0}
</update>
<sql id="queryWhereSql">
@@ -196,12 +197,14 @@
LEFT JOIN ope_reagent_status ors on ors.reagent_code = ouf.reagent_code
LEFT JOIN sys_reagent sr on sr.id = ors.reagent_id
left join base_meta bm1 on bm1.id = su.department
- <if test="userId !=null and userId != ''">
- LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
- </if>
WHERE
- LENGTH(trim(ouf.receipt_number))>0
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
+ <if test="userId !=null and userId != ''">
+ and ouf.user_id = #{userId}
+ </if>
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
</if>
@@ -230,6 +233,7 @@
</select>
<select id="selectPersonalUseInfo" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
SELECT ouf.receipt_number receiptNumber,
+ ouf.note,
count(ouf.reagent_code) applyNum,
su.name username,
su.project ,
@@ -246,11 +250,15 @@
LEFT JOIN sys_reagent sr on sr.id = ors.reagent_id
left join base_meta bm1 on bm1.id = su.department
left join sys_laboratory sl on sl.id = ouf.house_id
- <if test="userId !=null and userId != ''">
- LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
- </if>
- WHERE LENGTH(trim(ouf.receipt_number))>0
+
+ WHERE
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
+ <if test="userId !=null and userId != ''">
+ and ouf.user_id = #{userId}
+ </if>
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
</if>
@@ -300,7 +308,9 @@
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
WHERE
- ouf.receipt_number = #{receiptNumber}
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -315,7 +325,8 @@
LEFT JOIN base_meta bm1 on bm1.id = sr.reagent_unit
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
- WHERE ouf.operatestate = #{operatestate}
+ WHERE (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate})
and ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -337,6 +348,7 @@
</select>
<select id="selectByReceiptNumber" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
SELECT ouf.receipt_number receiptNumber,
+ ouf.note,
count(ouf.reagent_code) applyNum,
su.name username,
su.project ,
@@ -356,8 +368,9 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE
- LENGTH(trim(ouf.receipt_number))>0
+ WHERE (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
and ouf.receipt_number = #{receiptNumber}
group by ouf.receipt_number
--
Gitblit v1.9.2