From 8f8ba3c62d6fc9f4733a408daf59a5badd82e5e2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:42:26 +0800
Subject: [PATCH] 开发8-25人员管理与组织架构对接完成
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index eb7b820..f18693f 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -8,11 +8,11 @@
import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
-import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
-import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -50,6 +50,7 @@
}
Map<String, Object> data = new HashMap<>();
data.put("name",loginUser.get("name"));
+ data.put("id",loginUser.get("id"));
data.put("remind", remind);
return data;
}
@@ -75,8 +76,15 @@
}
@Override
- public List<User> selectUser() {
+ public List<Map<String,Object>> selectUser() {
return userMapper.selectUser();
+ }
+
+ @Override
+ public List<Map<String, Object>> getUserNameAndId() {
+ LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(User::getId, User::getName);
+ return userMapper.selectMaps(wrapper);
}
@Override
@@ -94,16 +102,13 @@
@Override
public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {
- User user = new User()
- .setName(newPersonnelVo.getName())
- .setAccount(newPersonnelVo.getAccount())
- .setAge(newPersonnelVo.getAge())
- .setPhone(newPersonnelVo.getPhone())
- .setEmail(newPersonnelVo.getEmail())
- .setRoleId(newPersonnelVo.getRole_id())
- .setPassword(newPersonnelVo.getPassword())
- .setEnterpriseId(Integer.valueOf(enterpriseId));
- return userMapper.insert(user);
+ try {
+ User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(newPersonnelVo), User.class);
+ unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));
+ return userMapper.insert(unmarshal);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
@Override
@@ -111,7 +116,7 @@
User user = new User()
.setName(updatePersonnelVo.getName())
.setAccount(updatePersonnelVo.getAccount())
- .setAge(updatePersonnelVo.getAge())
+ .setAge(String.valueOf(updatePersonnelVo.getAge()))
.setPhone(updatePersonnelVo.getPhone())
.setEmail(updatePersonnelVo.getEmail())
.setRoleId(updatePersonnelVo.getRole_id())
@@ -123,7 +128,8 @@
}
@Override
- public IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page) {
- return userMapper.getNewPersonnelPage(name, page);
+ public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
+ MyUtil.PrintLog(name + status + "=============");
+ return userMapper.getNewPersonnelPage(name, page, status);
}
}
--
Gitblit v1.9.3