From 3ec412f3cdc8b114cf629e866a7b7b80687a3442 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/SysControllerDao.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysControllerDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysControllerDao.xml
index 18e02d2..1141925 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysControllerDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysControllerDao.xml
@@ -52,6 +52,19 @@
</if>
</select>
+ <select id="exportExcelList" parameterType="java.util.Map" resultType="java.util.Map">
+ select sc.controller_name name,sc.controller_code code,b.meta_value type from sys_controller sc
+ left join base_meta b on b.id=sc.type
+ where sc.valid_flag = 1
+ <if test="code != null and code != ''">
+ and sc.controller_code like concat ("%",#{code},"%")
+ </if>
+ <if test="name != null and name != ''">
+ and sc.controller_name like concat ("%",#{name},"%")
+ </if>
+ order by create_time desc
+ </select>
+
<insert id="insertSysController" parameterType="com.nanometer.smartlab.entity.SysController">
insert into sys_controller(type,controller_code, controller_name, valid_flag, create_time, update_time)
values (#{type},#{controllerCode}, #{controllerName}, #{validFlag}, #{createTime}, #{updateTime})
--
Gitblit v1.9.2