From 31cf479562e2a03b8318540075f611339ca3690a Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:34:15 +0800
Subject: [PATCH] 2024-5-22 人员总览切换接口
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 10 ++++++++++
user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java | 2 ++
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 2 ++
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 10 ++++++++++
user-server/src/main/resources/mapper/UserMapper.xml | 18 ++++++++++++++++++
5 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 90522c7..507d143 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -98,6 +98,16 @@
UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
return Result.success(userService.selectUserList(page, user));
}
+
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "璧勬簮瑕佹眰-浜哄憳鎬昏")
+ @PostMapping("/selectPersonnelOverview")
+ public Result selectPersonnelOverview(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
+ return Result.success(userService.selectPersonnelOverview(page, user));
+ }
+
@ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "淇敼鐢ㄦ埛淇℃伅")
@PostMapping("/updateUser")
diff --git a/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java
index e0ec91b..42a89ae 100644
--- a/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java
@@ -16,6 +16,8 @@
IPage<User> selectUserDtoPageList(IPage<UserPageDto> page, QueryWrapper<UserPageDto> ew);
+ IPage<User> selectPersonnelOverview(IPage<UserPageDto> page, QueryWrapper<UserPageDto> ew);
+
//鑾峰彇璁惧璐熻矗浜�
List<User> getDeviceManager();
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index ec986f2..f35b724 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -18,6 +18,8 @@
Map<String, Object> selectUserList(IPage<UserPageDto> page, UserPageDto user);
+ Map<String, Object> selectPersonnelOverview(IPage<UserPageDto> page, UserPageDto user);
+
int updateUser(User user);
int addUser(User user);
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index 0952c4e..c9f0694 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -66,6 +66,16 @@
}
@Override
+ public Map<String, Object> selectPersonnelOverview(IPage<UserPageDto> page, UserPageDto user) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(UserPageDto.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
+ if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
+ map.put("body", userMapper.selectPersonnelOverview(page, QueryWrappers.queryWrappers(user)));
+ return map;
+ }
+
+ @Override
public int updateUser(User user) {
user.setDepartId("1,"+user.getDepartId());
return userMapper.updateById(user);
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index ecdc611..c9ac90a 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -16,6 +16,24 @@
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="selectPersonnelOverview" resultType="com.yuanchu.mom.dto.UserPageDto">
+ select * from (
+ select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user,
+ u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name
+ create_user_name, u3.name update_user_name, r.name role_name,u1.signature_url,u1.picture_url,u1.depart_id,
+ u1.name_en
+ from user u1
+ left join user u2 on u2.id = u1.create_user
+ left join user u3 on u3.id = u1.update_user
+ left join role r on u1.role_id = r.id
+ where u1.depart_lims_id is not null
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
<select id="getDeviceManager" resultType="com.yuanchu.mom.dto.UserPageDto">
select id, name
from user
--
Gitblit v1.9.3