From 123188cd4858079c37c960160002ce0c8ab98006 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 26 十一月 2020 16:42:18 +0800
Subject: [PATCH] 试剂管理查询优化

---
 src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index 77133ee..02acbed 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -95,6 +95,35 @@
     </if>
   </select>
 
+
+  <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
+    <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 type != ''">
+      and sr.type = #{type}
+    </if>
+    ORDER BY sr.create_time desc
+    <if test="first != null and pageSize != null">
+      limit #{first}, #{pageSize}
+    </if>
+  </select>
+
   <select id="getSysReagentTotalCount" parameterType="java.util.Map" resultType="int">
     select count(1)
     from sys_reagent as sr
@@ -111,6 +140,26 @@
     </if>
   </select>
 
+  <select id="getSysReagentTotalCountNew" parameterType="java.util.Map" resultType="int">
+    select count(1)
+    from sys_reagent as sr
+    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 type != ''">
+      and sr.type = #{type}
+    </if>
+
+  </select>
+
+
   <select id="getSysReagentByCas2" parameterType="com.nanometer.smartlab.entity.SysReagent" resultMap="SysReagent">
     select * From sys_reagent where type=0 and valid_flag = 1
     <if test="cas!=null and cas!=''">

--
Gitblit v1.9.2