From 3851bbe241d3f5caa9b208d6740b94f6d537b5c2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 29 Nov 2021 11:30:52 +0800
Subject: [PATCH] 1.押运人员编码查询
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 12 +++++++++++-
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 5 +++++
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 5 +++++
src/main/java/org/springblade/modules/system/service/IUserService.java | 5 +++++
4 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 15166d4..d5e20bc 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -222,4 +222,9 @@
* @return
*/
List<SecurityExcel> exportSecurityInfo(@Param("user") UserVO user);
+ /**
+ * 查询押运人员编码不为null的保安信息
+ * @return
+ */
+ List<Map<String, Object>> selectEquipent();
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 3adc6b5..0f849a8 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -786,6 +786,16 @@
ORDER BY bu.id desc
</select>
-
+ <!--查询押运人员编码不为null的保安信息-->
+ <select id="selectEquipent" resultType="java.util.HashMap">
+ SELECT id,
+ equipment_code as code
+ FROM blade_user
+ WHERE dept_id = '1460129345988239362'
+ AND role_id = '1412226235153731586'
+ AND is_deleted = 0
+ AND `status` = 1
+ AND equipment_code IS NOT NULL
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 0d60874..6699451 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -353,4 +353,9 @@
* @param deptId
*/
void importSecurityTest(List<SecurityExcel> data, Boolean isCovered, String deptId);
+ /**
+ * 查询押运人员编码不为null的保安信息
+ * @return
+ */
+ List<Map<String, Object>> selectEquipent();
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 0c06b9c..926be67 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -1636,4 +1636,9 @@
throw new ServiceException("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
}
}
+
+ @Override
+ public List<Map<String, Object>> selectEquipent() {
+ return baseMapper.selectEquipent();
+ }
}
--
Gitblit v1.9.3