From 1b0cec788ca49a6c641f84c2bf0e616049c22e70 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 25 六月 2021 14:22:40 +0800
Subject: [PATCH] 导入申购修改导入字段
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index b149844..c576cba 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -479,23 +479,28 @@
*
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 base_meta bm6 on sr.reagent_format = bm6.id
+ left join base_meta bm7 on sr.reagent_type = bm7.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})
+ sr.valid_flag = 1
+ <if test="params.packing != null and params.packing != ''">
+ and UPPER(concat(sr.main_metering,bm4.meta_value) ) = UPPER(#{params.packing})
</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.reagent_format != null and params.reagent_format != ''">
+ and bm6.meta_value = #{params.reagent_format}
+ </if>
+ <if test="params.reagent_type != null and params.reagent_type != ''">
+ and bm7.meta_value = #{params.reagent_type}
</if>
<if test="params.cas != null and params.cas != ''">
and sr.cas = #{params.cas}
@@ -504,7 +509,7 @@
and sr.product_sn = #{params.product_sn}
</if>
<if test="params.name != null and params.name != ''">
- and sr.name = #{params.name}
+ and sr.name = #{params.name};
</if>
</where>
--
Gitblit v1.9.2