From d9958d7a0acbeba3235a9b6c57ee55f45d9c6568 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 13:40:33 +0800
Subject: [PATCH] 功能调整
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
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..a39fae2 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
@@ -1,6 +1,7 @@
package com.yuanchu.mom.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -21,6 +22,7 @@
import org.springframework.util.DigestUtils;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -66,14 +68,24 @@
}
@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());
+ user.setDepartId("1," + user.getDepartId());
return userMapper.updateById(user);
}
@Override
public int addUser(User user) {
- user.setDepartId("1,"+user.getDepartId());
+ user.setDepartId("1");
return userMapper.insert(user);
}
@@ -114,46 +126,46 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addPersonUser(PersonDto personDto) {
- AtomicReference<String> departId = new AtomicReference<>("");
+ AtomicReference<String> departId = new AtomicReference<>("1,");
AtomicReference<String> companyName = new AtomicReference<>();
- personDto.getCompany().forEach(company->{
+ personDto.getCompany().forEach(company -> {
Departments department = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getCompanyId()));
- if(BeanUtil.isEmpty(department)){
+ if (BeanUtil.isEmpty(department)) {
department = new Departments();
department.setName(company.getCompanyName());
department.setCompanyId(company.getCompanyId());
Departments department2 = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getParentCompanyId()));
- if(BeanUtil.isEmpty(department2)){
+ if (BeanUtil.isEmpty(department2)) {
department.setFatherId(1);
- }else{
+ } else {
department.setFatherId(department2.getId());
}
departmentsMapper.insert(department);
}
- departId.set(departId.get()+department.getId()+",");
+ departId.set(departId.get() + department.getId() + ",");
companyName.set(department.getName());
});
personDto.getPerson().forEach(person -> {
User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, person.getEmployeeID()));
- if(BeanUtil.isEmpty(user)){
+ if (BeanUtil.isEmpty(user)) {
user = new User();
user.setName(person.getName());
user.setNameEn("not write");
user.setAccount(person.getEmployeeID());
user.setPhone(person.getPhoneNumber());
user.setEmail(person.getCompanyEmail());
- user.setIsCustom(person.getCompanyId().equals("SC2463")?0:1);
+ user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
user.setDepartId(departId.get());
// user.setPassword(DigestUtils.md5DigestAsHex(headerToken.getPassword(person.getEmployeeID()).getBytes()));
user.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
user.setCompany(companyName.get());
user.setAddress("鏈～鍐�");
userMapper.insert(user);
- }else{
+ } else {
user.setName(person.getName());
user.setPhone(person.getPhoneNumber());
user.setEmail(person.getCompanyEmail());
- user.setIsCustom(person.getCompanyId().equals("SC2463")?0:1);
+ user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
user.setDepartId(departId.get());
user.setCompany(companyName.get());
user.setCreateUser(null);
@@ -165,4 +177,15 @@
});
return 1;
}
+
+ @Override
+ public int upUserDepardLimsId(String ids, String id) {
+ List<Integer> userIds = JSON.parseArray(ids, Integer.class);
+ return userMapper.update(null, Wrappers.<User>lambdaUpdate().in(User::getId, userIds).set(User::getDepartLimsId, id).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ }
+
+ @Override
+ public int delUserDepardLimsId(Integer id) {
+ return userMapper.update(null, Wrappers.<User>lambdaUpdate().eq(User::getId, id).set(User::getDepartLimsId, null).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ }
}
--
Gitblit v1.9.3