From c87738a78f57e6f68a0111d68ef3748b29dc1eda Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 23 六月 2021 12:21:59 +0800
Subject: [PATCH] 修改试剂排序
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index 9823b84..b149844 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -102,7 +102,9 @@
FROM
(
SELECT
- sr.*, ss.meta_value AS product_home_name,
+ sr.*,
+ ss.meta_value AS product_home_name,
+ ss.order_index,
bm.meta_value AS control_products_name,
supplier. NAME AS supplierName,
f.id favor,
@@ -131,7 +133,9 @@
</if>
UNION ALL
SELECT
- sr.*, ss.meta_value AS product_home_name,
+ sr.*,
+ ss.meta_value AS product_home_name,
+ ss.order_index,
bm.meta_value AS control_products_name,
supplier.NAME AS supplierName,
f.id favor,
@@ -162,7 +166,7 @@
limit #{MaxSize}
</if>
) as reagent
- ORDER BY reagent.favortime DESC,length(reagent.name),price asc
+ ORDER BY reagent.favortime DESC,length(reagent.name),reagent.order_index,price asc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
</if>
@@ -388,8 +392,6 @@
sr.safetynum,
sr.name,
sr.main_metering,
- sr.productSn,
- sr.cas,
bm1.meta_value reagent_unit,
bm2.meta_value reagent_type,
bm3.meta_value reagent_format,
@@ -471,4 +473,43 @@
set safetynum = #{safetynum}
where id = #{id}
</update>
+
+ <select id="countReagentByDetail" resultMap="SysReagent">
+ select
+ *
+ from sys_reagent as sr
+ left join base_meta bm2 on sr.reagent_character = bm2.id
+ left join base_meta bm3 on sr.main_metering = bm3.id
+ left join base_meta bm4 on sr.reagent_unit = bm4.id
+ left join base_meta bm5 on sr.product_home = bm5.id
+ left join sys_supplier supply on sr.supplier_id = supply.id
+
+ <where>
+ <if test="params.reagent_unit != null and params.reagent_unit != ''">
+ and UPPER(bm4.meta_value) = UPPER(#{params.reagent_unit})
+ </if>
+ <if test="params.main_metering != null and params.main_metering != ''">
+ and UPPER(bm3.meta_value) = UPPER(#{params.main_metering})
+ </if>
+ <if test="params.product_home != null and params.product_home != ''">
+ and bm5.meta_value = #{params.product_home}
+ </if>
+ <if test="params.reagent_character != null and params.reagent_character != ''">
+ and bm2.meta_value = #{params.reagent_character}
+ </if>
+ <if test="params.cas != null and params.cas != ''">
+ and sr.cas = #{params.cas}
+ </if>
+ <if test="params.product_sn != null and params.product_sn != ''">
+ and sr.product_sn = #{params.product_sn}
+ </if>
+ <if test="params.name != null and params.name != ''">
+ and sr.name = #{params.name}
+ </if>
+ </where>
+
+
+
+
+ </select>
</mapper>
--
Gitblit v1.9.2