From 934b32c0af147ef324736c835e0e877962e893fe Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 19 Dec 2023 11:47:09 +0800
Subject: [PATCH] 审批功能
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 7 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 e51403d..f12e6e3 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
@@ -17,6 +17,7 @@
package org.springblade.modules.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,11 +26,13 @@
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.DictCache;
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;
+import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.IdCardNoUtil;
import org.springblade.common.utils.ImageUtils;
import org.springblade.common.utils.QRCodeUtil;
@@ -64,6 +67,7 @@
import org.springblade.modules.system.mapper.UserMapper;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.*;
+import org.springblade.modules.system.vo.UserInfoDetail;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
@@ -575,17 +579,25 @@
}
}
-// @Override
-// public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
-// List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
-// userList.forEach(user -> {
+ @Override
+ public List<UserExcel> exportUser(Map<String, Object> param) {
+ List<UserExcel> userList = baseMapper.exportUser(param);
+ userList.forEach(user -> {
// user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
// user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
// user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
// user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
-// });
-// return userList;
-// }
+
+ if (user.getSex() != null && StringUtil.isNotBlank(user.getSex())){
+ if (user.getSex().equals("1")){
+ user.setSex("男");
+ }else if (user.getSex().equals("2")){
+ user.setSex("女");
+ }
+ }
+ });
+ return userList;
+ }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -1879,4 +1891,49 @@
}
return null;
}
+
+ /**
+ * 微信注册用户，需要密码和手机号
+ * @param user
+ * @return
+ */
+ @Override
+ public Boolean wxRegister(User user) {
+ User params = new User();
+ params.setPhone(user.getPhone());
+ //查看数据库是否有相同手机号
+ List<User> list = list(Condition.getQueryWrapper(params));
+ if (list.size()>0){
+ throw new ServiceException("该用户已注册");
+ }
+
+ //注册新用户
+ user.setAccount(user.getPhone());
+
+ //微信注册角色
+ user.setRoleId("1734015564173127681");
+ //微信注册机构
+ user.setDeptId("1734016112398020609");
+
+ user.setTenantId("000000");
+
+ if (StringUtil.isNotBlank(user.getRealName())){
+ user.setName(user.getRealName());
+ }else{
+ user.setName("微信用户"+user.getPhone());
+ user.setRealName("微信用户"+user.getPhone());
+ }
+ boolean save = save(user);
+ return save;
+ }
+
+ @Override
+ public UserInfoDetail getUserInfoDetail(String id) {
+ return baseMapper.getUserInfoDetail(id);
+ }
+
+ @Override
+ public boolean batchAudit(String ids, String auditStatus) {
+ return baseMapper.batchAudit(ids,auditStatus);
+ }
}
--
Gitblit v1.9.3