From 9a93560be2a59e2ccc92a375b75a92de876a696b Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 06 一月 2022 15:12:56 +0800
Subject: [PATCH] 修改个人领用
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 13 +++++++------
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 2 --
2 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 8aebaf1..0290112 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -197,14 +197,14 @@
LEFT JOIN ope_reagent_status ors on ors.reagent_code = ouf.reagent_code
LEFT JOIN sys_reagent sr on sr.id = ors.reagent_id
left join base_meta bm1 on bm1.id = su.department
- <if test="userId !=null and userId != ''">
- LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
- </if>
WHERE
(ouf.operatestate = #{operatestate}
or ouf.operatestate = #{operatestate1})
and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
+ <if test="userId !=null and userId != ''">
+ and ouf.user_id = #{userId}
+ </if>
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
</if>
@@ -250,14 +250,15 @@
LEFT JOIN sys_reagent sr on sr.id = ors.reagent_id
left join base_meta bm1 on bm1.id = su.department
left join sys_laboratory sl on sl.id = ouf.house_id
- <if test="userId !=null and userId != ''">
- LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
- </if>
+
WHERE
(ouf.operatestate = #{operatestate}
or ouf.operatestate = #{operatestate1})
and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
+ <if test="userId !=null and userId != ''">
+ and ouf.user_id = #{userId}
+ </if>
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
</if>
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index 1bccad2..64e78c3 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -487,7 +487,6 @@
params.put("endTime",sdfend.format(now));
}
- params.put("userId", userId);
params.put("receiptNumber", receiptNumber);
params.put("department", department);
params.put("project", project);
@@ -542,7 +541,6 @@
}else {
params.put("endTime",sdfend.format(now));
}
- params.put("userId", userId);
params.put("receiptNumber", receiptNumber);
params.put("department", department);
params.put("project", project);
--
Gitblit v1.9.2