From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 12 Nov 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 19 ++++++++++++++-----
1 files changed, 14 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 6bef367..661eba9 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -108,7 +108,8 @@
bm.meta_value AS control_products_name,
supplier. NAME AS supplierName,
f.id favor,
- f.create_time favortime
+ f.create_time favortime,
+ supplier.valid_flag as supplierFlag
FROM
sys_reagent AS sr
LEFT JOIN base_meta AS ss ON sr.product_home = ss.id
@@ -133,14 +134,15 @@
and sr.product_sn like concat("%", #{productSn} ,"%")
</if>
UNION ALL
- SELECT
+ (SELECT
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,
- f.create_time favortime
+ f.create_time favortime,
+ supplier.valid_flag as supplierFlag
FROM
sys_reagent AS sr
LEFT JOIN base_meta AS ss ON sr.product_home = ss.id
@@ -167,6 +169,7 @@
<if test="MaxSize != null">
limit #{MaxSize}
</if>
+ )
) as reagent
ORDER BY reagent.favortime DESC,length(reagent.name),reagent.order_index,price asc
<if test="first != null and pageSize != null">
@@ -176,7 +179,12 @@
<select id="favorList" parameterType="java.util.Map" resultMap="SysReagent">
- 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
+ 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,
+ supplier.valid_flag as supplierFlag
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
@@ -533,7 +541,8 @@
c.meta_value formatName,
d.meta_value product_home_name,
e.meta_value control_products_name,
- s.name AS supplierName
+ s.name AS supplierName,
+ s.valid_flag as supplierFlag
from sys_reagent a
left join base_meta b on b.id=a.reagent_unit
left join base_meta c on c.id=a.reagent_format
--
Gitblit v1.9.2