From f93cc0a94a229c939e6c52940a2a008b86e0899f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 23 七月 2021 09:28:52 +0800
Subject: [PATCH] 修改审批管理
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index 4f0ff72..0a2d528 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -199,8 +199,8 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE ouf.operatestate = #{operatestate}
- and LENGTH(trim(ouf.receipt_number))>0
+ WHERE
+ LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -249,8 +249,7 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE ouf.operatestate = #{operatestate}
- and LENGTH(trim(ouf.receipt_number))>0
+ WHERE LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -300,8 +299,8 @@
LEFT JOIN base_meta bm1 on bm1.id = sr.reagent_unit
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
- WHERE ouf.operatestate = #{operatestate}
- and ouf.receipt_number = #{receiptNumber}
+ WHERE
+ ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -357,8 +356,8 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE ouf.operatestate = #{operatestate}
- and LENGTH(trim(ouf.receipt_number))>0
+ WHERE
+ LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
and ouf.receipt_number = #{receiptNumber}
group by ouf.receipt_number
--
Gitblit v1.9.2