From b30d8a0da429680f77326fca9dcf0877688c7a77 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 17:05:11 +0800
Subject: [PATCH] 订单领取修改过期查询
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index 87386f2..56a1cff 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -389,7 +389,16 @@
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 (oa.status=4 or oa.status=6 or oa.status = 10)
+ where oa.valid_flag = 1 and (
+ <choose>
+ <when test="status != null and status == 10">
+ oa.status = 10
+ </when>
+ <otherwise>
+ oa.status=4 or oa.status=6
+ </otherwise>
+ </choose>
+ )
<include refid="getOpeApplyReserveList_queryWhereSql" />
<if test="isAllApply != null">
<choose>
@@ -455,7 +464,16 @@
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 (oa.status=4 or oa.status=6 or oa.status = 10)
+ where oa.valid_flag = 1 and (
+ <choose>
+ <when test="status != null and status == 10">
+ oa.status = 10
+ </when>
+ <otherwise>
+ oa.status=4 or oa.status=6
+ </otherwise>
+ </choose>
+ )
<if test="reagentName != null and reagentName != ''">
and sr.name like concat('%',#{reagentName},'%')
</if>
--
Gitblit v1.9.2