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/DangerousEncodeMapper.xml | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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..d6f2d9c 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,44 @@
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>
+ <select id="selectById" resultType="com.nanometer.smartlab.entity.DangerousEncode">
+ select
+ <include refid="Base_Column_List" />
+ from sys_dangerous_encode
+ where id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.2