From 548c15acd182735a75fa8aa447e28645b6a36970 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 05 Jan 2022 09:25:47 +0800
Subject: [PATCH] 变更派遣修改，保安员年龄计算修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 202 ++++++++++++++++++++++++++++++--------------------
1 files changed, 121 insertions(+), 81 deletions(-)
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 e6007a5..e602b44 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
@@ -20,7 +20,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
@@ -62,12 +61,9 @@
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -185,35 +181,67 @@
@Override
public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
- List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
- //机构名称拼接
- userVOS.forEach(userVO -> {
- if (null != userVO.getCardid() && userVO.getCardid() != "") {
- userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
- } else {
- userVO.setAge(null);
- }
- if (null!=userVO.getDeptId()) {
- List<String> list = baseMapper.getDeptName(userVO.getDeptId());
- if (list.size() > 1) {
- if (null != list.get(1) && list.get(1) != "") {
- String s = list.get(1).toString();
- if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
+ if (null!=user.getAgeType() && user.getAgeType()!=4){
+ List<UserVO> userVOS = baseMapper.selectUserPagesByAge(page, user);
+ //机构名称拼接
+ userVOS.forEach(userVO -> {
+// if (null != userVO.getCardid() && userVO.getCardid() != "") {
+// userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
+// } else {
+// userVO.setAge(null);
+// }
+ if (null!=userVO.getDeptId()) {
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size() > 1) {
+ if (null != list.get(1) && list.get(1) != "") {
+ String s = list.get(1).toString();
+ if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
+ userVO.setDeptName(list.get(0));
+ }
+ else {
+ userVO.setDeptName(list.get(1) + "," + list.get(0));
+ }
+ } else {
userVO.setDeptName(list.get(0));
}
- else {
- userVO.setDeptName(list.get(1) + "," + list.get(0));
- }
- } else {
+ }
+ if (list.size() == 1) {
userVO.setDeptName(list.get(0));
}
}
- if (list.size() == 1) {
- userVO.setDeptName(list.get(0));
+ });
+ return page.setRecords(userVOS);
+ }else {
+ List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
+ //机构名称拼接
+ userVOS.forEach(userVO -> {
+// if (null != userVO.getCardid() && userVO.getCardid() != "") {
+// userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
+// } else {
+// userVO.setAge(null);
+// }
+ if (null!=userVO.getDeptId()) {
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size() > 1) {
+ if (null != list.get(1) && list.get(1) != "") {
+ String s = list.get(1).toString();
+ if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
+ userVO.setDeptName(list.get(0));
+ }
+ else {
+ userVO.setDeptName(list.get(1) + "," + list.get(0));
+ }
+ } else {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ if (list.size() == 1) {
+ userVO.setDeptName(list.get(0));
+ }
}
- }
- });
- return page.setRecords(userVOS);
+ });
+ return page.setRecords(userVOS);
+ }
}
@Override
@@ -870,13 +898,10 @@
user.setStatus(1);
user.setIsDeleted(0);
//判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是")) {
- user.setHold("1");
- }
- if (userExcel.getHold().equals("否")) {
- user.setHold("2");
- }
+ if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user.setHold("1");
+ }else {
+ user.setHold("2");
}
//判断年龄，超过60岁的不入
// if (AgeUtil.idCardToAge(user.getCardid())<60) {
@@ -936,20 +961,16 @@
if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){
user2.setDeptId(dept1.getId().toString());
//判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
- user2.setHold("1");
- //更新保安证编号
- user2.setSecuritynumber(user.getSecuritynumber());
- }
- if (userExcel.getHold().equals("否")) {
- user2.setHold("2");
- }
- }
- if (null!=userExcel.getRegistered()){
- user2.setRegistered(userExcel.getRegistered());
+ if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user.setHold("1");
}else {
- user2.setRegistered("");
+ user.setHold("2");
+ }
+ if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user2.setHold("1");
+ user2.setSecuritynumber(user.getSecuritynumber());
+ }else {
+ user2.setHold("2");
}
//更新用户数据
user2.setUpdateTime(new Date());
@@ -973,15 +994,11 @@
}else {
//如果是一致，则更新用户数据
//判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
- user2.setHold("1");
- //更新保安证编号
- user2.setSecuritynumber(user.getSecuritynumber());
- }
- if (userExcel.getHold().equals("否")) {
- user2.setHold("2");
- }
+ if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user2.setHold("1");
+ user2.setSecuritynumber(user.getSecuritynumber());
+ }else {
+ user2.setHold("2");
}
if (null!=userExcel.getRegistered()){
user2.setRegistered(userExcel.getRegistered());
@@ -1184,13 +1201,10 @@
user.setStatus(1);
user.setIsDeleted(0);
//判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是")) {
- user.setHold("1");
- }
- if (userExcel.getHold().equals("否")) {
- user.setHold("2");
- }
+ if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user.setHold("1");
+ }else {
+ user.setHold("2");
}
//分配保安角色
Role role = new Role();
@@ -1299,15 +1313,21 @@
if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){
user2.setDeptId(dept1.getId().toString());
//判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
- user2.setHold("1");
- //更新保安证编号
- user2.setSecuritynumber(user.getSecuritynumber());
- }
- if (userExcel.getHold().equals("否")) {
- user2.setHold("2");
- }
+// if (null != userExcel.getHold() && userExcel.getHold() != "") {
+// if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
+// user2.setHold("1");
+// //更新保安证编号
+// user2.setSecuritynumber(user.getSecuritynumber());
+// }
+// if (userExcel.getHold().equals("否")) {
+// user2.setHold("2");
+// }
+// }
+ if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user2.setHold("1");
+ user2.setSecuritynumber(user.getSecuritynumber());
+ }else {
+ user2.setHold("2");
}
if (null!=userExcel.getRegistered()){
user2.setRegistered(userExcel.getRegistered());
@@ -1335,15 +1355,21 @@
}else {
//如果是一致，则更新用户数据
//判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
- user2.setHold("1");
- //更新保安证编号
- user2.setSecuritynumber(user.getSecuritynumber());
- }
- if (userExcel.getHold().equals("否")) {
- user2.setHold("2");
- }
+// if (null != userExcel.getHold() && userExcel.getHold() != "") {
+// if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
+// user2.setHold("1");
+// //更新保安证编号
+// user2.setSecuritynumber(user.getSecuritynumber());
+// }
+// if (userExcel.getHold().equals("否")) {
+// user2.setHold("2");
+// }
+// }
+ if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user2.setHold("1");
+ user2.setSecuritynumber(user.getSecuritynumber());
+ }else {
+ user2.setHold("2");
}
if (null!=userExcel.getRegistered()){
user2.setRegistered(userExcel.getRegistered());
@@ -1696,4 +1722,18 @@
public List<Map<String, Object>> selectEquipent() {
return baseMapper.selectEquipent();
}
+
+
+ /**
+ * 年龄分布查询
+ * @param user
+ * @return
+ */
+ @Override
+ public Object getAgeStatistics(UserVO user) {
+ //获取年龄分布数据
+ List<Integer> list = baseMapper.getAgeStatistics(user);
+ //返回
+ return list;
+ }
}
--
Gitblit v1.9.3