From aa0d3808fdf551838aaa16548a00ea1f82375eed Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Wed, 23 Dec 2020 17:01:44 +0800
Subject: [PATCH] 修改
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 99 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 79 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index f067e14..682c9e2 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -95,16 +95,28 @@
</if>
</select>
- <select id="reagentList" parameterType="java.util.Map" resultType="int">
- 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
- 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
+ <select id="reagentList" parameterType="java.util.Map" resultMap="SysReagent">
+ SELECT
+ *
+ FROM
+ (
+ 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
+ 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 f.id IS NOT NULL
+ and 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 +125,41 @@
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
+ UNION ALL
+ 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
+ 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}
+ AND f.id IS NULL
+ where sr.valid_flag = 1
+ <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>
+ <if test="MaxSize != null">
+ limit #{MaxSize}
+ </if>
+ ) as reagent
+ ORDER BY reagent.favortime DESC,price asc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
</if>
@@ -139,7 +183,7 @@
</otherwise>
</choose>
<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}
@@ -148,7 +192,7 @@
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>
<choose>
<when test="favorFlag != ''">
@@ -180,7 +224,7 @@
</otherwise>
</choose>
<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}
@@ -189,7 +233,7 @@
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>
</select>
@@ -242,14 +286,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 +322,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