From d9f60308ed6aee9c4fbf9c073741dc78fc525b00 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 07 一月 2021 10:58:24 +0800
Subject: [PATCH] 新增：账户查询 修改：用户导入判断
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index 7f6ea53..4c1cb24 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -161,7 +161,7 @@
limit #{MaxSize}
</if>
) as reagent
- ORDER BY reagent.favortime DESC,price asc
+ ORDER BY reagent.favortime DESC,length(reagent.name),price asc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
</if>
@@ -346,35 +346,11 @@
<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">
--
Gitblit v1.9.2