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 |  427 ++++++++++++++++++++--------------------------------
 1 files changed, 165 insertions(+), 262 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 316a45b..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;
@@ -24,11 +25,14 @@
 import com.google.zxing.WriterException;
 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;
@@ -63,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;
@@ -73,6 +78,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -131,45 +137,12 @@
 		}
 		boolean b = save(user) && submitUserDept(user);
 		user.setIsDeleted(0);
-		String s = "insert into blade_user(id,tenant_id,account,password,real_name,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation," +
-			"politicaloutlook,healstats,height,address,registered,securitynumber,hold,status,dispatch,jurisdiction,is_deleted) " +
-			"values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
-			"'" + user.getPassword() + "'" + "," + "'" + user.getRealName() + "'" + "," +
-			"'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
-			"," + "'" + user.getDeptId() + "'" +
-			"," + "'" + user.getCardid() + "'" +
-			"," + "'" + user.getNativeplace() + "'" +
-			"," + "'" + user.getNation() + "'" +
-			"," + "'" + user.getPoliticaloutlook() + "'" +
-			"," + "'" + user.getHealstats() + "'"
-			+ "," + "'" + user.getHeight() + "'" +
-			"," + "'" + user.getAddress() + "'" +
-			"," + "'" + user.getRegistered() + "'" + "," +
-			"'" + user.getSecuritynumber() + "'" +
-			"," + "'" + user.getHold() + "'" +
-			"," + "'" + user.getStatus() + "'" +
-			"," + "'" + user.getDispatch() + "'"+
-			"," + "'" + user.getJurisdiction() + "'"+
-			"," + "'" + user.getIsDeleted() + "'"
-			+ ")";
-		//FtpUtil.sqlFileUpload(s);
-		myAsyncService.dataSync(s);
 		return b;
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean updateUser(User user) {
-//		String tenantId = user.getTenantId();
-//		Integer userCount = baseMapper.selectCount(
-//			Wrappers.<User>query().lambda()
-//				.eq(User::getTenantId, tenantId)
-//				.eq(User::getAccount, user.getAccount())
-//				.notIn(User::getId, user.getId())
-//		);
-//		if (userCount > 0) {
-//			throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
-//		}
 		return updateUserInfo(user) && submitUserDept(user);
 	}
 
@@ -198,11 +171,6 @@
 			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) {
@@ -228,11 +196,6 @@
 			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) {
@@ -616,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)
@@ -919,8 +890,8 @@
 				throw new ServiceException("导入失败!身份证号码不能为空!");
 			}
 			//身份证住址校验
-			if (null==user.getRegistered() || user.getRegistered().equals("")){
-				throw new ServiceException("导入失败!身份证住址不能为空!");
+			if (null==userExcel.getPermanentResidenceAddress() || userExcel.getPermanentResidenceAddress().equals("")){
+				throw new ServiceException("导入失败!户籍地址不能为空!");
 			}
 			if (null!=user.getCardid() && !user.getCardid().equals("")){
 				//去除所有空格
@@ -957,7 +928,7 @@
 				//默认在职
 				user.setStatus(1);
 				user.setIsDeleted(0);
-				user.setHold("2");
+				securityNumberCheck(securityInvalidList, securityInvalidStatus, user, userExcel.getSecuritynumber(), userExcel.getCardid());
 				//分配保安角色
 				Role role = new Role();
 				role.setRoleAlias("保安");
@@ -990,8 +961,24 @@
 					detailEntity.setMemberOfFamily(userExcel.getMemberOfFamily());
 					detailEntity.setWorkExperience(userExcel.getWorkExperience());
 					detailEntity.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
-					detailEntity.setMarriageStatus(Integer.parseInt(userExcel.getMarriageStatus()));
-					detailEntity.setSignLevel(Integer.parseInt(userExcel.getSignLevel()));
+					if (!Strings.isBlank(userExcel.getMarriageStatus())) {
+						detailEntity.setMarriageStatus(Integer.parseInt(userExcel.getMarriageStatus()));
+					}
+					if (!Strings.isBlank(userExcel.getSignLevel())) {
+						detailEntity.setSignLevel(Integer.parseInt(userExcel.getSignLevel()));
+					}
+					detailEntity.setUnitName(userExcel.getUnitName());
+					detailEntity.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
+					detailEntity.setDwellAddress(userExcel.getDwellAddress());
+					detailEntity.setAcceptancePoliceUnit(userExcel.getAcceptancePoliceUnit());
+					detailEntity.setAcceptancePerson(userExcel.getAcceptancePerson());
+					if (!Strings.isBlank(userExcel.getAcceptanceTime())){
+						try {
+							detailEntity.setAcceptanceTime(new SimpleDateFormat("yyyy/MM/dd").parse(userExcel.getAcceptanceTime()));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					}
 					userDetailService.save(detailEntity);
 				}
 				//加入集合
@@ -1018,32 +1005,11 @@
 //						return;
 					continue;
 				}else {
-					//如果是一致,则更新用户数据
-					if (null!=userExcel.getRegistered()){
-						user2.setRegistered(userExcel.getRegistered());
-					}else {
-						user2.setRegistered("");
-					}
-
-					// 住址
-					if (null!=userExcel.getAddress()){
-						user2.setAddress(userExcel.getAddress());
-					}else {
-						user2.setAddress("");
-					}
-
 					// 学历
 					if (null!=userExcel.getEducation()){
 						user2.setEducation(user.getEducation());
 					}else {
 						user2.setEducation("");
-					}
-
-					// 从业单位
-					if (null!=userExcel.getUnitName()){
-						user2.setUnitName(userExcel.getUnitName());
-					}else {
-						user2.setUnitName("");
 					}
 
 					// 政治面貌
@@ -1068,8 +1034,24 @@
 							one.setMemberOfFamily(userExcel.getMemberOfFamily());
 							one.setWorkExperience(userExcel.getWorkExperience());
 							one.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
-							one.setMarriageStatus(Integer.parseInt(userExcel.getMarriageStatus()));
-							one.setSignLevel(Integer.parseInt(userExcel.getSignLevel()));
+							if (!Strings.isBlank(userExcel.getMarriageStatus())) {
+								one.setMarriageStatus(Integer.parseInt(userExcel.getMarriageStatus()));
+							}
+							if (!Strings.isBlank(userExcel.getSignLevel())) {
+								one.setSignLevel(Integer.parseInt(userExcel.getSignLevel()));
+							}
+							one.setUnitName(userExcel.getUnitName());
+							one.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
+							one.setDwellAddress(userExcel.getDwellAddress());
+							one.setAcceptancePoliceUnit(userExcel.getAcceptancePoliceUnit());
+							one.setAcceptancePerson(userExcel.getAcceptancePerson());
+							if (!Strings.isBlank(userExcel.getAcceptanceTime())){
+								try {
+									one.setAcceptanceTime(new SimpleDateFormat("yyyy/MM/dd").parse(userExcel.getAcceptanceTime()));
+								} catch (ParseException e) {
+									e.printStackTrace();
+								}
+							}
 							userDetailService.updateById(one);
 						}else {
 							UserDetailEntity detailEntity = new UserDetailEntity();
@@ -1079,8 +1061,24 @@
 							detailEntity.setMemberOfFamily(userExcel.getMemberOfFamily());
 							detailEntity.setWorkExperience(userExcel.getWorkExperience());
 							detailEntity.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
-							detailEntity.setMarriageStatus(Integer.parseInt(userExcel.getMarriageStatus()));
-							detailEntity.setSignLevel(Integer.parseInt(userExcel.getSignLevel()));
+							if (!Strings.isBlank(userExcel.getMarriageStatus())) {
+								detailEntity.setMarriageStatus(Integer.parseInt(userExcel.getMarriageStatus()));
+							}
+							if (!Strings.isBlank(userExcel.getSignLevel())) {
+								detailEntity.setSignLevel(Integer.parseInt(userExcel.getSignLevel()));
+							}
+							detailEntity.setUnitName(userExcel.getUnitName());
+							detailEntity.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
+							detailEntity.setDwellAddress(userExcel.getDwellAddress());
+							detailEntity.setAcceptancePoliceUnit(userExcel.getAcceptancePoliceUnit());
+							detailEntity.setAcceptancePerson(userExcel.getAcceptancePerson());
+							if (!Strings.isBlank(userExcel.getAcceptanceTime())){
+								try {
+									detailEntity.setAcceptanceTime(new SimpleDateFormat("yyyy/MM/dd").parse(userExcel.getAcceptanceTime()));
+								} catch (ParseException e) {
+									e.printStackTrace();
+								}
+							}
 							userDetailService.save(detailEntity);
 						}
 					}
@@ -1124,6 +1122,47 @@
 		}
 	}
 
+	/**
+	 * 判断是否持证
+	 * @param securityInvalidList
+	 * @param securityInvalidStatus
+	 * @param user
+	 * @param securitynumber
+	 * @param cardid2
+	 */
+	public void securityNumberCheck(List<String> securityInvalidList, AtomicBoolean securityInvalidStatus, User user, String securitynumber, String cardid2) {
+		//判断是否持证
+		if (null != securitynumber && securitynumber != "") {
+			user.setHold("1");
+			//校验保安员证编号是否合规
+			SecurityPaper securityPaper = new SecurityPaper();
+			securityPaper.setIdCardNo(cardid2);
+			List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+			if (securityPaperList.size() > 0) {
+				boolean state = false;
+				//遍历
+				for (SecurityPaper paper : securityPaperList) {
+					if (paper.getNumber().equals(user.getSecuritynumber())) {
+						state = true;
+					}
+				}
+				if (!state) {
+					user.setHold("2");
+					user.setSecuritynumber(null);
+					securityInvalidList.add(cardid2);
+					securityInvalidStatus.set(false);
+				}
+			} else {
+				user.setHold("2");
+				user.setSecuritynumber(null);
+				securityInvalidList.add(cardid2);
+				securityInvalidStatus.set(false);
+			}
+		} else {
+			user.setHold("2");
+		}
+	}
+
 	@Override
 	public void importSecurityYy(List<SecurityYyExcel> data, Boolean isCovered, String deptId) {
 		//将不能导入的保安员账号存起来
@@ -1158,10 +1197,6 @@
 			if (null==user.getCardid() || user.getCardid().equals("")){
 				throw new ServiceException("导入失败!身份证号码不能为空!");
 			}
-			//身份证住址校验
-			if (null==user.getRegistered() || user.getRegistered().equals("")){
-				throw new ServiceException("导入失败!身份证住址不能为空!");
-			}
 			if (null!=user.getCardid() && !user.getCardid().equals("")){
 				//去除所有空格
 				String cardid = user.getCardid().replaceAll(" ", "");
@@ -1192,35 +1227,7 @@
 				user.setStatus(1);
 				user.setIsDeleted(0);
 				//判断是否持证
-				if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
-					user.setHold("1");
-					//校验保安员证编号是否合规
-					SecurityPaper securityPaper = new SecurityPaper();
-					securityPaper.setIdCardNo(userExcel.getCardid());
-					List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-					if (securityPaperList.size()>0){
-						boolean state = false;
-						//遍历
-						for (SecurityPaper paper : securityPaperList) {
-							if (paper.getNumber().equals(user.getSecuritynumber())){
-								state = true;
-							}
-						}
-						if (!state){
-							user.setHold("2");
-							user.setSecuritynumber(null);
-							securityInvalidList.add(userExcel.getCardid());
-							securityInvalidStatus.set(false);
-						}
-					}else {
-						user.setHold("2");
-						user.setSecuritynumber(null);
-						securityInvalidList.add(userExcel.getCardid());
-						securityInvalidStatus.set(false);
-					}
-				}else {
-					user.setHold("2");
-				}
+				securityNumberCheck(securityInvalidList, securityInvalidStatus, user, userExcel.getSecuritynumber(), userExcel.getCardid());
 				//分配保安角色
 				Role role = new Role();
 				role.setRoleAlias("保安");
@@ -1303,11 +1310,6 @@
 						}else {
 							user2.setHold("2");
 						}
-						if (null!=userExcel.getRegistered()){
-							user2.setRegistered(userExcel.getRegistered());
-						}else {
-							user2.setRegistered("");
-						}
 						user2.setUpdateTime(new Date());
 						//更新用户数据
 						this.updateById(user2);
@@ -1361,23 +1363,9 @@
 					}else {
 						user2.setHold("2");
 					}
-					if (null!=userExcel.getRegistered()){
-						user2.setRegistered(userExcel.getRegistered());
-					}else {
-						user2.setRegistered("");
-					}
 					user2.setUpdateTime(new Date());
 					//更新用户数据
 					this.updateById(user2);
-
-					String s1 =
-						"update blade_user set hold = " + "'" + user2.getHold() + "'"
-							+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
-							+ ",registered = " + "'" + user2.getRegistered() + "'"
-							+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
-							+ " " + "where id = " + "'" + user2.getId() + "'";
-					//FtpUtil.sqlFileUpload(s1);
-					myAsyncService.dataSync(s1);
 				}
 			}
 		});
@@ -1649,10 +1637,6 @@
 			if (null==user.getCardid() || user.getCardid().equals("")){
 				throw new ServiceException("导入失败!身份证号码不能为空!");
 			}
-			//身份证住址校验
-			if (null==user.getRegistered() || user.getRegistered().equals("")){
-				throw new ServiceException("导入失败!身份证住址不能为空!");
-			}
 			if (null!=user.getCardid() && !user.getCardid().equals("")){
 				//去除所有空格
 				String cardid = user.getCardid().replaceAll(" ", "");
@@ -1683,61 +1667,6 @@
 				user.setStatus(1);
 				user.setIsDeleted(0);
 				user.setHold("2");
-				//判断是否持证
-//				if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
-//					user.setHold("1");
-//					//校验保安员证编号是否合规
-//					SecurityPaper securityPaper = new SecurityPaper();
-//					securityPaper.setIdCardNo(userExcel.getCardid());
-//					List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-//					if (securityPaperList.size()>0){
-//						boolean state = false;
-//						//遍历
-//						for (SecurityPaper paper : securityPaperList) {
-//							if (paper.getNumber().equals(user.getSecuritynumber())){
-//								state = true;
-//							}
-//						}
-//						if (!state){
-//							user.setHold("2");
-//							user.setSecuritynumber(null);
-//							securityInvalidList.add(userExcel.getCardid());
-//							securityInvalidStatus.set(false);
-//						}
-//					}else {
-//						user.setHold("2");
-//						user.setSecuritynumber(null);
-//						securityInvalidList.add(userExcel.getCardid());
-//						securityInvalidStatus.set(false);
-//					}
-//				}else {
-//					//创建保安证编号
-//					user.setHold("1");
-//					//去生成保安证编号
-//					String pre = SecurityPaperUtil.getSecurityPaper();
-//					//查询当前年份已有的保安证编号
-//					int max = this.getSecurityPaperCount(pre);
-//					String result = null;
-//					if (max == 0) {
-//						result = pre + "00001";
-//					} else {
-//						//格式化
-//						DecimalFormat decimalFormat = new DecimalFormat("00000");
-//						max++;
-//						result = pre + (decimalFormat.format(max));
-//					}
-//					user.setSecuritynumber(result);
-//
-//					//生成保安证的同时向保安证管理表中插入一条数据
-//					SecurityPaper securityPaper = new SecurityPaper();
-//					securityPaper.setNumber(result);
-//					securityPaper.setCreateTime(new Date());
-//					securityPaper.setIdCardNo(user.getCardid());
-//					securityPaper.setPeopleName(user.getRealName());
-//					securityPaper.setSource(3);
-//					//新增保安员证信息
-//					securityPaperService.save(securityPaper);
-//				}
 				//分配保安角色
 				Role role = new Role();
 				role.setRoleAlias("保安");
@@ -1791,80 +1720,9 @@
 					continue;
 				}else {
 					//如果是一致,则更新用户数据
-					//判断是否持证
-//					if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
-//						user2.setHold("1");
-//						user2.setSecuritynumber(user.getSecuritynumber());
-//						//校验保安员证编号是否合规
-//						SecurityPaper securityPaper = new SecurityPaper();
-//						securityPaper.setIdCardNo(userExcel.getCardid());
-//						List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-//						if (securityPaperList.size()>0){
-//							boolean state = false;
-//							//遍历
-//							for (SecurityPaper paper : securityPaperList) {
-//								if (paper.getNumber().equals(user.getSecuritynumber())){
-//									state = true;
-//								}
-//							}
-//							if (!state){
-//								user2.setHold("2");
-//								user2.setSecuritynumber(null);
-//								securityInvalidList.add(userExcel.getCardid());
-//								securityInvalidStatus.set(false);
-//							}
-//						}else {
-//							user2.setHold("2");
-//							user2.setSecuritynumber(null);
-//							securityInvalidList.add(userExcel.getCardid());
-//							securityInvalidStatus.set(false);
-//						}
-//					}else {
-//						//创建保安证编号
-//						user2.setHold("1");
-//						//去生成保安证编号
-//						String pre = SecurityPaperUtil.getSecurityPaper();
-//						//查询当前年份已有的保安证编号
-//						int max = this.getSecurityPaperCount(pre);
-//						String result = null;
-//						if (max == 0) {
-//							result = pre + "00001";
-//						} else {
-//							//格式化
-//							DecimalFormat decimalFormat = new DecimalFormat("00000");
-//							max++;
-//							result = pre + (decimalFormat.format(max));
-//						}
-//						user2.setSecuritynumber(result);
-//
-//						//生成保安证的同时向保安证管理表中插入一条数据
-//						SecurityPaper securityPaper = new SecurityPaper();
-//						securityPaper.setNumber(result);
-//						securityPaper.setCreateTime(new Date());
-//						securityPaper.setIdCardNo(user2.getCardid());
-//						securityPaper.setPeopleName(user2.getRealName());
-//						securityPaper.setSource(3);
-//						//新增保安员证信息
-//						securityPaperService.save(securityPaper);
-//					}
-					if (null!=userExcel.getRegistered()){
-						user2.setRegistered(userExcel.getRegistered());
-					}else {
-						user2.setRegistered("");
-					}
 					user2.setUpdateTime(new Date());
 					//更新用户数据
 					this.updateById(user2);
-					//qfqk异步推送
-//					myAsyncService.updateUserByQfqk(user2);
-					//内网数据sql
-					String s1 =
-						"update blade_user set hold = " + "'" + user2.getHold() + "'"
-							+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
-							+ ",registered = " + "'" + user2.getRegistered() + "'"
-							+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
-							+ " " + "where id = " + "'" + user2.getId() + "'";
-					myAsyncService.dataSync(s1);
 				}
 			}
 		}
@@ -2033,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