From 31ffbaf322685984516cfb284fa58741debf4e96 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml | 16 ++++++++++++++--
1 files changed, 14 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 5025194..17ab524 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
@@ -223,7 +223,6 @@
from ope_reagent_status as oa
<include refid="queryJoins3"/>
where oa.valid_flag = 1
- and (oa.status = -1 or oa.status = 0 )
<include refid="queryWhereSql3"/>
<if test="applyPerson != null and applyPerson != ''" >
and su.name like concat("%",#{applyPerson},"%")
@@ -263,7 +262,6 @@
<include refid="queryJoins2"/>
left join sys_user su on su.id = oa.user_id
where oa.valid_flag = 1
- and (oa.status = -1 or oa.status = 0 )
<include refid="queryWhereSql2"/>
<if test="applyPerson != null and applyPerson != ''" >
and su.name like concat("%",#{applyPerson},"%")
@@ -434,4 +432,18 @@
and valid_flag = 1
ORDER BY update_time
</select>
+ <select id="countReagentByArticleAndWarehouse" resultType="java.lang.Integer">
+ select count(*)
+ from ope_reagent_status
+ WHERE status = 1
+ <if test="reagentId != null and reagentId !=''">
+ and reagent_id = #{reagentId}
+ </if>
+ <if test="articleNumber != null and articleNumber !=''">
+ and article_number = #{articleNumber}
+ </if>
+ <if test="warehouseId != null and warehouseId !=''">
+ and house_id = #{warehouseId}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.2