From 8731d758f88e84b41c6a269a6da2d6325faa3867 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 23 Jun 2021 12:55:44 +0800
Subject: [PATCH] 试剂名称去空格
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 12 +++++++-----
1 files changed, 7 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 26e374d..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,
--
Gitblit v1.9.2