From daaf2caafd40f3657aa1f7e45bc1641d482baeb1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 01 Dec 2023 16:54:10 +0800
Subject: [PATCH] 保安员详情信息新增，修改，删除调整
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 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 0853aba..eb17904 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
@@ -752,18 +752,41 @@
*/
@Override
public List<TreeNode> getSecurityApplyTree(UserVO user) {
- Map<Long, TreeNode> map = baseMapper.getSecurityApplyTree(user);
- List<TreeNode> tree = new ArrayList<>();
- if (map.size() > 1) {
- map.forEach((id, treeNode) -> {
- if (map.containsKey(treeNode.getParentId())) {
- map.get(treeNode.getParentId()).getChildren().add(treeNode);
- } else {
- tree.add(treeNode);
+ // 总的
+ List<TreeNode> allList = new ArrayList<>();
+ // 考试未通过
+ List<TreeNode> notList = new ArrayList<>();
+ // 新申报报名的
+ List<TreeNode> newList = new ArrayList<>();
+ // 查询
+ List<TreeNode> treeNodeList = baseMapper.getSecurityApplyTree(user);
+ // 遍历
+ if (treeNodeList.size()>0){
+ for (TreeNode treeNode : treeNodeList) {
+ if (treeNode.getType()==1){
+ notList.add(treeNode);
}
- });
+ if (treeNode.getType()==2){
+ newList.add(treeNode);
+ }
+ }
}
- return tree;
+ if (newList.size()>0){
+ // 新申报报名的
+ TreeNode treeNode = new TreeNode();
+ treeNode.setName("新申报名单");
+ treeNode.setChildren(newList);
+ allList.add(treeNode);
+ }
+ if (notList.size()>0){
+ // 考试未通过
+ TreeNode treeNode = new TreeNode();
+ treeNode.setName("未通过考试名单");
+ treeNode.setChildren(notList);
+ allList.add(treeNode);
+ }
+ // 返回
+ return allList;
}
/**
@@ -2013,4 +2036,39 @@
// 统一注销操作
baseMapper.updateLogout(userIds);
}
+
+ /**
+ * 判断用户是否存在(根据手机号）
+ * @param phone
+ * @return
+ */
+ @Override
+ public UserInfo getUserByPhone(String phone) {
+ User user = baseMapper.getUserByPhone("000000", phone);
+ return buildUserInfo(user, UserEnum.WEB);
+ }
+
+ /**
+ * 判断是否报名
+ * @param id
+ * @return
+ */
+ @Override
+ public boolean getUserIsApply(Long id) {
+ User user = baseMapper.getUserIsApply(id);
+ if (null!=user){
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * 自定义查询详情信息
+ * @param id
+ * @return
+ */
+ @Override
+ public UserVO getUserDetailById(Long id) {
+ return baseMapper.getUserDetailById(id);
+ }
}
--
Gitblit v1.9.3