Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
car-database-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
中汽研标准应用数据库
car-database-api
Commits
3c019e4b
Commit
3c019e4b
authored
Sep 05, 2024
by
yuanshuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改获取评审人员列表接口/review/scene/change/task/getReviewerList
parent
f5906a79
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
104 additions
and
78 deletions
+104
-78
ReviewSceneChangeTaskServiceImpl.java
.../ruoyi/service/impl/ReviewSceneChangeTaskServiceImpl.java
+1
-2
SysDeptMapper.java
.../src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
+17
-14
SysPostMapper.java
.../src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
+14
-12
SysRoleMapper.java
.../src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
+15
-13
SysUserMapper.java
.../src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+17
-13
SysUserPostMapper.java
.../main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
+7
-5
ISysUserService.java
...c/main/java/com/ruoyi/system/service/ISysUserService.java
+2
-0
SysUserServiceImpl.java
...ava/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+5
-0
SysUserMapper.xml
...system/src/main/resources/mapper/system/SysUserMapper.xml
+26
-19
No files found.
quality-review/src/main/java/com/ruoyi/service/impl/ReviewSceneChangeTaskServiceImpl.java
View file @
3c019e4b
...
@@ -522,9 +522,8 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
...
@@ -522,9 +522,8 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
public
List
<
SysUser
>
getReviewList
()
{
public
List
<
SysUser
>
getReviewList
()
{
// 获取用户ID列表
// 获取用户ID列表
List
<
Long
>
reviewerIdList
=
sysUserRoleMapper
.
selectReviewerIdByRoleId
(
ReviewSceneChangeTask
.
REVIEW_ROLE_ID
);
List
<
Long
>
reviewerIdList
=
sysUserRoleMapper
.
selectReviewerIdByRoleId
(
ReviewSceneChangeTask
.
REVIEW_ROLE_ID
);
System
.
out
.
println
(
reviewerIdList
+
"========"
);
// 获取用户列表
// 获取用户列表
List
<
SysUser
>
reviewerList
=
sysUserService
.
selectUserListByIds
(
reviewerIdList
);
List
<
SysUser
>
reviewerList
=
sysUserService
.
selectUserListByIds
New
(
reviewerIdList
);
for
(
SysUser
user
:
reviewerList
){
for
(
SysUser
user
:
reviewerList
){
user
.
setDept
(
iSysDeptService
.
selectDeptById
(
user
.
getDeptId
()));
user
.
setDept
(
iSysDeptService
.
selectDeptById
(
user
.
getDeptId
()));
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
View file @
3c019e4b
package
com
.
ruoyi
.
system
.
mapper
;
package
com
.
ruoyi
.
system
.
mapper
;
import
java.util.List
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
...
@@ -9,6 +11,7 @@ import com.ruoyi.common.core.domain.entity.SysDept;
...
@@ -9,6 +11,7 @@ import com.ruoyi.common.core.domain.entity.SysDept;
*
*
* @author ruoyi
* @author ruoyi
*/
*/
@Mapper
public
interface
SysDeptMapper
public
interface
SysDeptMapper
{
{
/**
/**
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
View file @
3c019e4b
...
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
...
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
import
java.util.List
;
import
java.util.List
;
import
com.ruoyi.system.domain.SysPost
;
import
com.ruoyi.system.domain.SysPost
;
import
org.apache.ibatis.annotations.Mapper
;
/**
/**
* 岗位信息 数据层
* 岗位信息 数据层
*
*
* @author ruoyi
* @author ruoyi
*/
*/
@Mapper
public
interface
SysPostMapper
public
interface
SysPostMapper
{
{
/**
/**
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
View file @
3c019e4b
...
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
...
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
import
java.util.List
;
import
java.util.List
;
import
com.ruoyi.common.core.domain.entity.SysRole
;
import
com.ruoyi.common.core.domain.entity.SysRole
;
import
org.apache.ibatis.annotations.Mapper
;
/**
/**
* 角色表 数据层
* 角色表 数据层
*
*
* @author ruoyi
* @author ruoyi
*/
*/
@Mapper
public
interface
SysRoleMapper
public
interface
SysRoleMapper
{
{
/**
/**
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View file @
3c019e4b
...
@@ -5,6 +5,7 @@ import java.util.List;
...
@@ -5,6 +5,7 @@ import java.util.List;
import
com.ruoyi.system.domain.vo.SysUserVO
;
import
com.ruoyi.system.domain.vo.SysUserVO
;
import
com.ruoyi.system.domain.vo.UserCountVo
;
import
com.ruoyi.system.domain.vo.UserCountVo
;
import
com.ruoyi.system.request.InspectionRequest
;
import
com.ruoyi.system.request.InspectionRequest
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
...
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
...
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
*
*
* @author ruoyi
* @author ruoyi
*/
*/
@Mapper
public
interface
SysUserMapper
public
interface
SysUserMapper
{
{
/**
/**
...
@@ -161,4 +163,6 @@ public interface SysUserMapper
...
@@ -161,4 +163,6 @@ public interface SysUserMapper
* @return
* @return
*/
*/
List
<
SysUserVO
>
getInspection
();
List
<
SysUserVO
>
getInspection
();
List
<
SysUser
>
selectUserListByIdsNew
(
@Param
(
"ids"
)
List
<
Long
>
ids
);
}
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
View file @
3c019e4b
...
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
...
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
import
java.util.List
;
import
java.util.List
;
import
com.ruoyi.system.domain.SysUserPost
;
import
com.ruoyi.system.domain.SysUserPost
;
import
org.apache.ibatis.annotations.Mapper
;
/**
/**
* 用户与岗位关联表 数据层
* 用户与岗位关联表 数据层
*
*
* @author ruoyi
* @author ruoyi
*/
*/
@Mapper
public
interface
SysUserPostMapper
public
interface
SysUserPostMapper
{
{
/**
/**
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View file @
3c019e4b
...
@@ -239,4 +239,6 @@ public interface ISysUserService
...
@@ -239,4 +239,6 @@ public interface ISysUserService
* @return
* @return
*/
*/
List
<
SysUserVO
>
getInspection
();
List
<
SysUserVO
>
getInspection
();
List
<
SysUser
>
selectUserListByIdsNew
(
List
<
Long
>
ids
);
}
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View file @
3c019e4b
...
@@ -621,6 +621,11 @@ public class SysUserServiceImpl implements ISysUserService
...
@@ -621,6 +621,11 @@ public class SysUserServiceImpl implements ISysUserService
return
deduplicatedList
;
return
deduplicatedList
;
}
}
@Override
public
List
<
SysUser
>
selectUserListByIdsNew
(
List
<
Long
>
ids
)
{
return
userMapper
.
selectUserListByIdsNew
(
ids
);
}
// 辅助方法,用于去重
// 辅助方法,用于去重
private
static
<
T
>
java
.
util
.
function
.
Predicate
<
T
>
distinctByKey
(
java
.
util
.
function
.
Function
<?
super
T
,
?>
keyExtractor
)
{
private
static
<
T
>
java
.
util
.
function
.
Predicate
<
T
>
distinctByKey
(
java
.
util
.
function
.
Function
<?
super
T
,
?>
keyExtractor
)
{
java
.
util
.
Map
<
Object
,
Boolean
>
seen
=
new
java
.
util
.
concurrent
.
ConcurrentHashMap
<>();
java
.
util
.
Map
<
Object
,
Boolean
>
seen
=
new
java
.
util
.
concurrent
.
ConcurrentHashMap
<>();
...
...
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View file @
3c019e4b
...
@@ -149,6 +149,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -149,6 +149,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{userId}
#{userId}
</foreach>
</foreach>
</select>
</select>
<select
id=
"selectUserListByIdsNew"
resultType=
"com.ruoyi.common.core.domain.entity.SysUser"
>
select * from sys_user u
where u.del_flag = '0' and u.user_id in
<foreach
collection=
"ids"
item=
"userId"
open=
"("
separator=
","
close=
")"
>
#{userId}
</foreach>
</select>
<select
id=
"selectUserListByRoleId"
resultMap=
"SysUserResult"
>
<select
id=
"selectUserListByRoleId"
resultMap=
"SysUserResult"
>
SELECT u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
SELECT u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment