From df47c9300bfe6c641c88707aa5b54591ab4c004c Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Fri, 11 Jun 2021 15:18:58 +0800
Subject: [PATCH] 订单领取：过期处理(确认和过期 状态处理),增加状态过期（需要将数据库字段加长） 实验室选中问题 仓库领取的仓库不存在问题
---
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml | 9 +++++++++
1 files changed, 9 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..57cb6b2 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,6 +633,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
</select>
--
Gitblit v1.9.2