From 24dca40330bbaf928dd911fc9c1a960b0f4b1b28 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 13:15:12 +0800
Subject: [PATCH] 订单领取修改过期查询
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index f4c2a24..87386f2 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -355,7 +355,7 @@
<if test="userId != null and userId != ''">
and oa.apply_user_id =#{userId}
</if>
- <if test="status != null and status != ''">
+ <if test="status != null ">
and oa.status =#{status}
</if>
<if test="productSn != null and productSn != ''">
@@ -455,16 +455,7 @@
LEFT JOIN base_meta AS bm1 ON sr.product_home = bm1.id
LEFT JOIN sys_project as project on project.project = su.project
LEFT JOIN sys_user as su1 on su1.id = project.sys_user_id
- where oa.valid_flag = 1 and (
- <choose>
- <when test="status == @com.nanometer.smartlab.entity.enumtype.ApplyStatus@EXPIRED">
- oa.status = 10
- </when>
- <otherwise>
- oa.status=4 or oa.status=6
- </otherwise>
- </choose>
- )
+ where oa.valid_flag = 1 and (oa.status=4 or oa.status=6 or oa.status = 10)
<if test="reagentName != null and reagentName != ''">
and sr.name like concat('%',#{reagentName},'%')
</if>
@@ -474,7 +465,7 @@
<if test="userId != null and userId != ''">
and oa.apply_user_id =#{userId}
</if>
- <if test="status != null and status != ''">
+ <if test="status != null ">
and oa.status =#{status}
</if>
<if test="productSn != null and productSn != ''">
--
Gitblit v1.9.2