From d7427ab305dc17af447f5832903691eee329850c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 09:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yufei' into yufei
---
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
index 42a4385..36d76e3 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" >
@@ -201,15 +211,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>
@@ -223,13 +233,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 project
- from sys_laboratory_container
- where container_code = #{0}
- and 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