From d4934eb71ed33c9b07cb0dc7bbcbd27450e0e122 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 10 十二月 2020 10:39:07 +0800
Subject: [PATCH] 模块:试剂流向追踪 修改：残余量增加单位 提出：秦老师
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index bff07b9..c4b89a2 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -95,7 +95,7 @@
</if>
</select>
- <select id="reagentList" parameterType="java.util.Map" resultType="int">
+ <select id="reagentList" 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
from sys_reagent as sr
left join base_meta as ss on sr.product_home = ss.id
@@ -104,7 +104,7 @@
LEFT JOIN favor f on f.reagent_id = sr.id AND f.user_id = #{user}
where sr.valid_flag = 1
<if test="cas != null and cas != ''">
- and sr.cas = #{cas}
+ and sr.cas like concat("%", #{cas} ,"%")
</if>
<if test="supplierId != null and supplierId != ''">
and sr.supplier_id = #{supplierId}
@@ -113,9 +113,8 @@
and sr.name like concat("%", #{name} ,"%")
</if>
<if test="productSn != null and productSn != ''">
- and sr.product_sn = #{productSn}
+ and sr.product_sn like concat("%", #{productSn} ,"%")
</if>
- ORDER BY sr.create_time desc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
</if>
@@ -242,14 +241,20 @@
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
LEFT JOIN favor f on f.reagent_id = sr.id AND f.user_id = #{user}
where sr.valid_flag = 1
- <include refid="queryWhereSql"/>
- <if test="favor != null and favor != '' ">
- and f.id is not null
+ <if test="cas != null and cas != ''">
+ and sr.cas like concat("%", #{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="productSn != null and productSn != ''">
+ and sr.product_sn like concat("%", #{productSn} ,"%")
</if>
</select>
@@ -272,6 +277,15 @@
</select>
+ <select id="getReagentUnitByReagentId" parameterType="java.lang.String" resultType="java.lang.String">
+ SELECT bm.meta_value
+ from sys_reagent sr
+ LEFT JOIN base_meta bm on bm.id = sr.reagent_unit
+ where sr.valid_flag =1
+ and bm.valid_flag = 1
+ and sr.id = #{reagentId}
+ </select>
+
<select id="getSysReagentByCas2" parameterType="com.nanometer.smartlab.entity.SysReagent" resultMap="SysReagent">
select * From sys_reagent where type=0 and valid_flag = 1
--
Gitblit v1.9.2