From 0dfab938c5116c8fa0191cadf36a47f5bb4f2936 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 16 九月 2021 15:50:52 +0800
Subject: [PATCH] 申购：管制品 搜索
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index 0c3bb58..b565933 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -108,7 +108,8 @@
bm.meta_value AS control_products_name,
supplier. NAME AS supplierName,
f.id favor,
- f.create_time favortime
+ f.create_time favortime,
+ supplier.valid_flag as supplierFlag
FROM
sys_reagent AS sr
LEFT JOIN base_meta AS ss ON sr.product_home = ss.id
@@ -118,6 +119,7 @@
AND f.user_id= #{user}
WHERE f.id IS NOT NULL
and sr.valid_flag = 1
+ and (supplier.valid_flag = 1 or sr.type = 0)
and sr.type != 3
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
@@ -139,7 +141,8 @@
bm.meta_value AS control_products_name,
supplier.NAME AS supplierName,
f.id favor,
- f.create_time favortime
+ f.create_time favortime,
+ supplier.valid_flag as supplierFlag
FROM
sys_reagent AS sr
LEFT JOIN base_meta AS ss ON sr.product_home = ss.id
@@ -149,6 +152,7 @@
AND f.user_id = #{user}
AND f.id IS NULL
where sr.valid_flag = 1
+ and (supplier.valid_flag = 1 or sr.type = 0)
and sr.type != 3
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
@@ -174,13 +178,19 @@
<select id="favorList" parameterType="java.util.Map" resultMap="SysReagent">
- select sr.*, ss.meta_value as product_home_name, bm.meta_value as control_products_name,supplier.name as supplierName,f.id favor,f.create_time favortime
+ select sr.*, ss.meta_value as product_home_name,
+ bm.meta_value as control_products_name,
+ supplier.name as supplierName,
+ f.id favor,
+ f.create_time favortime,
+ supplier.valid_flag as supplierFlag
from sys_reagent as sr
left join base_meta as ss on sr.product_home = ss.id
left join base_meta bm on bm.id = sr.control_products
left join sys_supplier supplier on supplier.id = sr.supplier_id
LEFT JOIN favor f on f.reagent_id = sr.id AND f.user_id = #{user}
where sr.valid_flag = 1
+ and (supplier.valid_flag = 1 or sr.type = 0)
<choose>
<when test="favorFlag != ''">
and f.id is not null
@@ -222,6 +232,7 @@
left join sys_supplier supplier on supplier.id = sr.supplier_id
LEFT JOIN favor f on f.reagent_id = sr.id AND f.user_id = #{user}
where sr.valid_flag = 1
+ and (supplier.valid_flag = 1 or sr.type = 0)
<choose>
<when test="favorFlag != ''">
and f.id is not null
@@ -247,13 +258,12 @@
<select id="getSysReagentListNew" parameterType="java.util.Map" resultMap="SysReagent">
select sr.*, ss.meta_value as product_home_name, ifnull(w.reserve,0) as reserve, bm.meta_value as control_products_name,supplier.name as supplierName
from sys_reagent as sr
-
left join base_meta as ss on sr.product_home = ss.id
left join base_meta bm on bm.id = sr.control_products
left join (select reagent_id, sum(reserve) reserve from ope_warehouse_reserve where valid_flag = 1 group by reagent_id) w on w.reagent_id = sr.id
-
left join sys_supplier supplier on supplier.id = sr.supplier_id
where sr.valid_flag = 1
+ and (supplier.valid_flag = 1 or sr.type = 0)
<if test="cas != null and cas != ''">
and sr.cas = #{cas}
</if>
@@ -281,7 +291,6 @@
left join base_meta as ss on sr.product_home = ss.id
left join base_meta bm on bm.id = sr.control_products
left join (select reagent_id, sum(reserve) reserve from ope_warehouse_reserve where valid_flag = 1 group by reagent_id) w on w.reagent_id = sr.id
-
left join sys_supplier supplier on supplier.id = sr.supplier_id
LEFT JOIN favor f on f.reagent_id = sr.id AND f.user_id = #{user}
where sr.valid_flag = 1
@@ -299,6 +308,7 @@
left join sys_supplier supplier on supplier.id = sr.supplier_id
LEFT JOIN favor f on f.reagent_id = sr.id AND f.user_id = #{user}
where sr.valid_flag = 1
+ and (supplier.valid_flag = 1 or sr.type = 0)
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
</if>
@@ -316,7 +326,9 @@
<select id="getSysReagentTotalCountNew" parameterType="java.util.Map" resultType="int">
select count(1)
from sys_reagent as sr
+ LEFT JOIN sys_supplier ss on ss.id = sr.supplier_id
where sr.valid_flag = 1
+ and (ss.valid_flag = 1 or sr.type = 0)
<if test="cas != null and cas != ''">
and sr.cas = #{cas}
</if>
@@ -528,7 +540,8 @@
c.meta_value formatName,
d.meta_value product_home_name,
e.meta_value control_products_name,
- s.name AS supplierName
+ s.name AS supplierName,
+ s.valid_flag as supplierFlag
from sys_reagent a
left join base_meta b on b.id=a.reagent_unit
left join base_meta c on c.id=a.reagent_format
--
Gitblit v1.9.2