From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug
---
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
index bf8afd8..be36307 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
@@ -96,6 +96,29 @@
</select>
+ <select id="getSysLaboratoryContainerSimpleInfoList" parameterType="java.util.Map" resultMap="SysLaboratoryContainer">
+ select su.id,su.name,su.container_code,su.info_code,su.project as project,bm1.meta_value as type,bm2.meta_value as structure,
+ ss.name as laboratoryName,sc.controller_name as controllerName from sys_laboratory_container as su
+ left join sys_laboratory as ss on su.laboratory_id = ss.id
+ left join sys_controller sc on sc.controller_code=su.controller_code
+ left join base_meta bm1 ON bm1.id = su.type
+ left join base_meta bm2 ON bm2.id = su.structure
+ where su.valid_flag = 1
+ AND sc.valid_flag = 1
+ AND ss.valid_flag = 1
+ <if test="laboratoryName != null and laboratoryName != ''">
+ and ss.name like #{laboratoryName}
+ </if>
+ <if test="controllerName != null and controllerName != ''">
+ and sc.controller_name like concat("%",#{controllerName},"%")
+ </if>
+ order by su.create_time desc
+ <if test="first != null and pageSize != null">
+ limit #{first}, #{pageSize}
+ </if>
+ </select>
+
+
<select id="exportExcelList" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
bm2.meta_value labType,
@@ -240,6 +263,7 @@
<select id="selectLocationByContainerCode" parameterType="java.lang.String" resultType="java.util.Map">
SELECT
+ sl.name,
CONCAT(sl.location1,"-",sl.location2) location,sl.bar_code barCode
FROM sys_laboratory_container slc
--
Gitblit v1.9.2