From b9863f4bba1b11ebbaa51328abc7a7bd01fdf22a Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 09 十二月 2020 09:45:30 +0800
Subject: [PATCH] 模块:实验室存储管理 新增:导出 提出:秦老师

---
 src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 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 9d61475..7397426 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
@@ -56,6 +56,8 @@
     left join sys_laboratory as ss on su.laboratory_id = ss.id
     left join sys_controller sc on sc.controller_code=su.controller_code
     where su.valid_flag = 1
+    AND sc.valid_flag = 1
+    AND ss.valid_flag = 1
     <if test="laboratoryType != null and laboratoryType != ''">
       and ss.type = #{laboratoryType}
     </if>
@@ -71,11 +73,45 @@
     </if>
   </select>
 
+
+  <select id="exportExcelList" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+    bm2.meta_value labType,
+    sl.NAME labName,
+    sc.controller_name controlName,
+    slc.container_code containerCode,
+    bm1.meta_value containerType ,
+    slc.info_code infoCode ,
+    bm3.meta_value structure,
+    slc.`name` name
+    FROM
+    sys_laboratory_container slc
+    LEFT JOIN base_meta bm1 ON bm1.id = slc.type
+    LEFT JOIN sys_laboratory sl ON sl.id = slc.laboratory_id
+    LEFT JOIN base_meta bm2 ON bm2.id = sl.type
+    LEFT JOIN sys_controller sc ON slc.controller_code = sc.controller_code
+    LEFT JOIN base_meta bm3 on bm3.id = slc.structure
+    WHERE
+    slc.valid_flag = 1
+    AND sc.valid_flag = 1
+    AND sl.valid_flag = 1
+    <if test="type != null and type != ''">
+     and sl.type = #{type}
+    </if>
+    <if test="name != null and name != ''">
+      and sl.name like concat("%",#{name},"%")
+    </if>
+    order by sl.name ASC,sc.controller_name,slc.container_code,slc.name
+
+  </select>
+
   <select id="getSysLaboratoryContainerTotalCount" parameterType="java.util.Map" resultType="int">
     select count(1) 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
     where su.valid_flag = 1
+    AND sc.valid_flag = 1
+    AND ss.valid_flag = 1
     <if test="laboratoryType != null and laboratoryType != ''">
       and ss.type = #{laboratoryType}
     </if>

--
Gitblit v1.9.2