From 23378ad3e494d226909df417db7559b31c2eca3f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 18:32:56 +0800
Subject: [PATCH] 保安员列表查询接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 9 +++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/system/controller/RoleController.java | 12 ++++++++++++
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 2 +-
src/main/java/org/springblade/modules/system/controller/UserController.java | 2 +-
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 2 +-
src/main/java/org/springblade/modules/system/service/IUserService.java | 2 +-
src/main/java/org/springblade/modules/system/vo/UserVO.java | 5 +++++
8 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index 91d67ae..a90ed71 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -5,7 +5,7 @@
<!--考试成绩分页信息-->
<select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
SELECT
- es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,
+ es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
ke.exam_name examName,bu.real_name securityName,company,es.exam_time examTime,
all_grade allGrade,exam_end_time examEndTime,qualified,
bd.dept_name companyName
diff --git a/src/main/java/org/springblade/modules/system/controller/RoleController.java b/src/main/java/org/springblade/modules/system/controller/RoleController.java
index d4c6f57..62d2c5d 100644
--- a/src/main/java/org/springblade/modules/system/controller/RoleController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RoleController.java
@@ -72,6 +72,18 @@
return R.data(RoleWrapper.build().entityVO(detail));
}
+
+ /**
+ * 详情
+ */
+ @GetMapping("/details")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入role")
+ public R<Role> details(Role role) {
+ Role detail = roleService.getOne(Condition.getQueryWrapper(role));
+ return R.data(detail);
+ }
+
/**
* 列表
*/
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 283ed70..08f7d12 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -140,7 +140,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
IPage<UserVO> pages = userService.selectUserPages(Condition.getPage(query), user, deptId, "000000");
return R.data(pages);
}
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 a4ce154..bb2fdfe 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -46,7 +46,7 @@
* @param tenantId
* @return
*/
- List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
/**
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 b320444..e5c50d2 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -63,6 +63,10 @@
sys_live_location sll
on
sll.worker_id = bu.id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
bu.is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
@@ -82,6 +86,9 @@
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
+ </if>
+ <if test="user.roleAlias!=null and user.roleAlias != ''">
+ and (br.role_alias = '保安' or br.role_alias = '未持证保安')
</if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
@@ -195,6 +202,8 @@
FROM blade_user
where cardid = #{param1}
</select>
+
+
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMap">
select
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 36927ba..70693e6 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -73,7 +73,7 @@
* @param tenantId
* @return
*/
- IPage<UserVO> selectUserPages(IPage<UserVO> page, User user, Long deptId, String tenantId);
+ IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
/**
* 自定义分页
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 4b535a8..c97fd00 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
@@ -138,7 +138,7 @@
}
@Override
- public IPage<UserVO> selectUserPages(IPage<UserVO> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList, tenantId));
}
diff --git a/src/main/java/org/springblade/modules/system/vo/UserVO.java b/src/main/java/org/springblade/modules/system/vo/UserVO.java
index debb952..2a6c25b 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -102,5 +102,10 @@
*/
private Long applyId;
+ /**
+ * 角色别名
+ */
+ private String roleAlias;
+
}
--
Gitblit v1.9.3