From 3ec412f3cdc8b114cf629e866a7b7b80687a3442 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml b/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
index 84d2724..f5678c9 100644
--- a/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
@@ -298,7 +298,8 @@
</select>
<select id="selectByCodeAndName" resultType="com.nanometer.smartlab.entity.DangerousEncode">
select
- <include refid="Base_Column_List" />
+ container_number containerNumber, reagent_code reagentCode, reagent_name reagentName, cas, memo, property, feature, avoid,
+ status, fire, random, code, update_time, creator, count
from sys_dangerous_encode
<where>
1=1
@@ -309,11 +310,38 @@
and reagent_name = #{reagentname}
</if>
<if test="cas != null and cas != ''">
- and cas = #{cas}
+ and cas like concat("%",#{cas},"%")
</if>
<if test="code != null and code != ''">
and code = #{code}
</if>
</where>
</select>
+ <select id="selectByReagentName" resultType="com.nanometer.smartlab.entity.DangerousEncodeVo">
+ select
+ container_number containerNumber, reagent_code reagentCode, reagent_name reagentName, cas, memo, property, feature, avoid,
+ status, fire, random, code, update_time, creator, count
+ from sys_dangerous_encode
+ <where>
+ 1=1
+ <if test="reagentname != null and reagentname != ''">
+ and reagent_name like concat("%",#{reagentname},"%")
+ </if>
+ <if test="cas != null and cas != ''">
+ and cas like concat("%",#{cas},"%")
+ </if>
+ </where>
+ </select>
+ <select id="selectByName" resultType="com.nanometer.smartlab.entity.DangerousEncode">
+ select
+ id,container_number containerNumber, reagent_code reagentCode, reagent_name reagentName, cas, memo,
+ property, feature, avoid, status, fire, random, code, update_time, creator, count
+ from sys_dangerous_encode
+ <where>
+ 1=1
+ <if test="reagentname != null and reagentname != ''">
+ and reagent_name = #{reagentname}
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.2