From 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 21 一月 2021 11:20:53 +0800
Subject: [PATCH] 修改处理报警接口
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 150 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 106 insertions(+), 44 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..4fc53ba 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -95,16 +95,29 @@
</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
+ and sr.type != 3
<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 +126,42 @@
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
+ and sr.type != 3
+ <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,length(reagent.name),price asc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
</if>
@@ -215,6 +261,9 @@
<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 sr.create_time desc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
@@ -242,14 +291,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>
@@ -269,7 +324,18 @@
<if test="type != null">
and sr.type = #{type}
</if>
+ <if test="productSn != null and productSn != ''">
+ and sr.product_sn like concat("%", #{productSn} ,"%")
+ </if>
+ </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>
@@ -285,38 +351,34 @@
<select id="getSysReagentByCas" parameterType="com.nanometer.smartlab.entity.SysReagent" resultMap="SysReagent">
select * From sys_reagent where type=1 and valid_flag = 1
- <if test="cas!=null and cas!=''">
- and cas = #{cas}
+ <if test="productSn!=null and productSn!=''">
+ and product_sn = #{productSn}
</if>
- <if test="cas==null or cas==''">
- and cas is null
- </if>
- <if test="mainMetering!=null and mainMetering!=''">
- and main_metering = #{mainMetering}
- </if>
- <if test="mainMetering==null or mainMetering==0">
- and main_metering is null
- </if>
- <if test="reagentUnit!=null and reagentUnit!=''">
- and reagent_unit=#{reagentUnit}
- </if>
- <if test="reagentUnit==null or reagentUnit==''">
- and reagent_unit is null
- </if>
- <if test="reagentFormat!=null and reagentFormat!=''">
- and reagent_format=#{reagentFormat}
- </if>
- <if test="reagentFormat==null or reagentFormat==''">
- and reagent_format is null
- </if>
- <if test="productHome!=null and productHome!=''">
- and product_home = #{productHome}
- </if>
- <if test="productHome==null or productHome==''">
- and product_home is null
+ <if test="supplierId!=null and supplierId!=''">
+ and supplier_id = #{supplierId}
</if>
</select>
+ <select id="getReagent" resultMap="SysReagent">
+ select * From sys_reagent
+ where type=3
+ and valid_flag = 1
+ <if test="name!=null and name!=''">
+ and name =#{name}
+ </if>
+ <if test="cas!=null and cas!=''">
+ and cas =#{cas}
+ </if>
+ <if test="packing!=null and packing!=''">
+ and reagent_unit =#{packing}
+ </if>
+ <if test="factory!=null and factory!=''">
+ and product_home =#{factory}
+ </if>
+ <if test="specifications!=null and specifications!=''">
+ and reagent_format =#{specifications}
+ </if>
+ </select>
<insert id="insertSysReagent" parameterType="com.nanometer.smartlab.entity.SysReagent">
--
Gitblit v1.9.2