From 3da43e60cd97ad330dcc0911d76bb3c395a65b0c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 02 七月 2021 12:09:38 +0800
Subject: [PATCH] 修改危废统计

---
 src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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..373fdbb 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
@@ -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