From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 22 二月 2021 10:34:59 +0800
Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序
---
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
index d0724ec..7b9520c 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
@@ -30,14 +30,24 @@
</select>
<select id="getSysLaboratoryContainer" parameterType="java.lang.String" resultMap="SysLaboratoryContainer" >
- select su.*,ss.name as laboratoryName, ss.type as laboratoryType ,su.project project from sys_laboratory_container as su
+ select su.*,ss.name as laboratoryName, ss.type as laboratoryType ,su.project project
+ from sys_laboratory_container as su
left join sys_laboratory as ss on su.laboratory_id = ss.id
- where su.id = #{id} and su.valid_flag = 1
+ where su.id = #{id}
+ and su.valid_flag = 1
+ and ss.valid_flag = 1
</select>
<select id="getSysLaboratoryContainerByContainerCode" parameterType="java.lang.String" resultMap="SysLaboratoryContainer">
- select * from sys_laboratory_container
- where container_code = #{containerCode} and valid_flag = 1
+ SELECT
+ sys_laboratory_container.*
+ FROM
+ sys_laboratory_container
+ LEFT JOIN sys_laboratory on sys_laboratory.id = sys_laboratory_container.laboratory_id
+ WHERE
+ sys_laboratory_container.container_code = #{containerCode}
+ AND sys_laboratory_container.valid_flag = 1
+ AND sys_laboratory.valid_flag = 1
</select>
<select id="updateSysLabContainer" parameterType="java.util.Map" >
@@ -67,6 +77,12 @@
<if test="laboratoryName != null and laboratoryName != ''">
and ss.name like #{laboratoryName}
</if>
+ <if test="project != null and project != ''">
+ and su.project like concat("%",#{project},"%")
+ </if>
+ <if test="controllerName != null and controllerName != ''">
+ and sc.controller_name like concat("%",#{controllerName},"%")
+ </if>
order by ss.name ASC,sc.controller_name,su.container_code,su.name
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
@@ -83,7 +99,8 @@
bm1.meta_value containerType ,
slc.info_code infoCode ,
bm3.meta_value structure,
- slc.`name` name
+ slc.`name` name,
+ slc.project
FROM
sys_laboratory_container slc
LEFT JOIN base_meta bm1 ON bm1.id = slc.type
@@ -100,6 +117,12 @@
</if>
<if test="name != null and name != ''">
and sl.name like concat("%",#{name},"%")
+ </if>
+ <if test="project != null and project != ''">
+ and slc.project like concat("%",#{project},"%")
+ </if>
+ <if test="controllerName != null and controllerName != ''">
+ and sc.controller_name like concat("%",#{controllerName},"%")
</if>
order by sl.name ASC,sc.controller_name,slc.container_code,slc.name
@@ -126,6 +149,12 @@
</if>
<if test="editId != null and editId != ''">
and su.id != #{editId}
+ </if>
+ <if test="project != null and project != ''">
+ and su.project like concat("%",#{project},"%")
+ </if>
+ <if test="controllerName != null and controllerName != ''">
+ and sc.controller_name like concat("%",#{controllerName},"%")
</if>
</select>
@@ -189,15 +218,15 @@
<select id="getContainerPersonInCharge" parameterType="java.lang.String" resultType="java.util.Map">
SELECT slc.container_code containCode,su.name name,su.phone phone,
-CONCAT(sl.location1,"-",sl.location2) location
-
-FROM sys_laboratory_container slc
-LEFT JOIN sys_laboratory sl on sl.id = slc.laboratory_id
-LEFT JOIN sys_user su on su.department = sl.department
-LEFT JOIN base_role br on br.id = su.role_id
-WHERE slc.container_code = #{containerCode}
-and su.valid_flag =1
-and br.`name` = '实验负责人'
+ CONCAT(sl.location1,"-",sl.location2) location
+ FROM sys_laboratory_container slc
+ LEFT JOIN sys_laboratory sl on sl.id = slc.laboratory_id
+ LEFT JOIN sys_user su on su.department = sl.department
+ LEFT JOIN base_role br on br.id = su.role_id
+ WHERE slc.container_code = #{containerCode}
+ and su.valid_flag =1
+ and sl.valid_flag =1
+ and br.`name` = '实验负责人'
</select>
@@ -211,6 +240,18 @@
LEFT JOIN sys_laboratory sl on sl.id = slc.laboratory_id
WHERE slc.container_code = #{containerCode}
and slc.valid_flag = 1
+ and sl.valid_flag = 1
</select>
+ <select id="selectProjectsByContainerCode" resultType="java.lang.String">
+ SELECT
+ slc.project
+ FROM
+ sys_laboratory_container AS slc
+ LEFT JOIN sys_laboratory sl ON sl.id = slc.laboratory_id
+ WHERE
+ slc.container_code = #{0}
+ AND slc.valid_flag = 1
+ AND sl.valid_flag = 1
+ </select>
</mapper>
--
Gitblit v1.9.2