From 07794736f879adb9cf02a69e5c6ada6a94b7bbde Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 06 Nov 2023 14:10:58 +0800
Subject: [PATCH] 考试报名查询修改，分新报名和考试未通过
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 11 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 3e6f473..b54ef0a 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
@@ -24,6 +24,7 @@
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.config.QrcodeConfig;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
@@ -339,6 +340,19 @@
public UserInfo userInfo(String tenantId, String account, String password) {
User user = baseMapper.getUser(tenantId, account, password);
return buildUserInfo(user);
+ }
+
+ /**
+ * 获取用户信息（wx）
+ * @param tenantId
+ * @param phone
+ * @param userEnum
+ * @return
+ */
+ @Override
+ public UserInfo userInfoByWx(String tenantId, String phone, UserEnum userEnum) {
+ User user = baseMapper.getUserByPhone(tenantId, phone);
+ return buildUserInfo(user, userEnum);
}
@Override
@@ -738,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;
}
/**
@@ -1539,7 +1576,7 @@
*/
@Override
public void importQrCode(List<QrCodeExcel> data, Boolean isCovered, String deptId) {
- String url = "http://61.131.136.25:2080/securityInfo.html";
+ String url = QrcodeConfig.baseUrl + "securityInfo.html";
//二维码生成
data.forEach(qrCodeExcel -> {
if (null!=qrCodeExcel.getSecuritynumber()) {
@@ -1977,4 +2014,26 @@
public User getUserById(String id) {
return baseMapper.getUserById(Long.parseLong(id));
}
+
+ /**
+ * 6个月未登录人员，进行冻结
+ */
+ @Override
+ public void sixMonthNotLoginHandle() {
+ // 查询6个月未登录人员
+ List<String> userIds = baseMapper.getMoreDayNotLoginUser(183);
+ // 统一冻结操作
+ baseMapper.updateFreeze(userIds);
+ }
+
+ /**
+ * 12个月未登录人员，进行注销
+ */
+ @Override
+ public void oneYearNotLoginHandle() {
+ // 查询12个月未登录人员
+ List<String> userIds = baseMapper.getMoreDayNotLoginUser(366);
+ // 统一注销操作
+ baseMapper.updateLogout(userIds);
+ }
}
--
Gitblit v1.9.3