From d629fe1ff6a7c9c720e5ab94c8eb07a737b4dc0f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 06 Aug 2021 16:28:27 +0800
Subject: [PATCH] 添加新疆大学、安科院配置
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index 8aa3d68..6cb3fa6 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -118,6 +118,7 @@
AND f.user_id= #{user}
WHERE f.id IS NOT NULL
and sr.valid_flag = 1
+ and supplier.valid_flag = 1
and sr.type != 3
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
@@ -149,6 +150,7 @@
AND f.user_id = #{user}
AND f.id IS NULL
where sr.valid_flag = 1
+ and supplier.valid_flag = 1
and sr.type != 3
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
@@ -247,13 +249,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
<if test="cas != null and cas != ''">
and sr.cas = #{cas}
</if>
@@ -299,6 +300,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
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
</if>
@@ -316,7 +318,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
<if test="cas != null and cas != ''">
and sr.cas = #{cas}
</if>
@@ -549,4 +553,47 @@
left join sys_supplier supplier on supplier.id = sr.supplier_id
where sr.id = #{id}
</select>
+ <select id="selectAll" resultType="java.util.Map">
+ select
+ sr.name,
+ sr.product_sn as productSn,
+ sr.cas,
+ sr.price,
+ sr.per_box as perBox,
+ sr.safetynum,
+
+ CASE WHEN type = 0 THEN '耗材' WHEN type = 1 THEN '试剂' ELSE '' END AS kind,
+ ss.meta_value as productHomeName,
+ bm.meta_value as control_products_name,
+ supplier.name as supplierName,
+ bm1.meta_value as reagentType,
+ bm2.meta_value as reagentCharacter,
+ bm3.meta_value as reagentFormat,
+ CONCAT(sr.main_metering,bm4.meta_value) as reagentUnit
+ 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 base_meta bm1 on bm1.id = sr.reagent_type
+ left join base_meta bm2 on bm2.id = sr.reagent_character
+ left join base_meta bm3 on bm3.id = sr.reagent_format
+ left join base_meta bm4 on bm4.id = sr.reagent_unit
+ left join sys_supplier supplier on supplier.id = sr.supplier_id
+ where sr.valid_flag = 1
+ <if test="cas != null and cas != ''">
+ and sr.cas = #{cas}
+ </if>
+ <if test="supplierId != null and supplierId != ''">
+ and sr.supplier_id = #{supplierId}
+ </if>
+ <if test="name != null and name != ''">
+ and sr.name like concat("%", #{name} ,"%")
+ </if>
+ <if test="type != null">
+ and sr.type = #{type}
+ </if>
+ <if test="productSn != null and productSn != ''">
+ and sr.product_sn like concat("%", #{productSn} ,"%")
+ </if>
+ ORDER BY length(sr.name),sr.create_time desc
+ </select>
</mapper>
--
Gitblit v1.9.2