productDev/dmvisit.git

			@@ -57,6 +57,7 @@
			import org.apache.commons.collections.CollectionUtils;
			import org.apache.commons.lang3.RandomStringUtils;
			import org.apache.commons.lang3.StringUtils;
			import org.apache.poi.ss.usermodel.CellType;
			import org.apache.shiro.SecurityUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -125,6 +126,10 @@
			private TmsService tmsService;
			@Autowired
			private SystemUserMapper systemUserMapper;
			@Autowired
			private CarsMapper carsMapper;
			@Autowired
			private ParkBookMapper parkBookMapper;

			@Autowired
			@Lazy
			@@ -578,11 +583,13 @@
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void deleteById(Integer id,LoginUserInfo loginUserInfo) {

			Date date =new Date();
			Member member=new Member();
			member.setId(id);
			member.setIsdeleted(Constants.ONE);
			member.setEditor(loginUserInfo.getId());
			member.setEditDate(new Date());
			member.setEditDate(date);
			member.setHkStatus(Constants.ZERO);
			member.setRemark("人员已删除，等待删除门禁权限");
			memberMapper.updateById(member);
			@@ -596,8 +603,30 @@
			.set(SystemUser::getUpdateUser,member.getEditor())
			.set(SystemUser::getUpdateTime,member.getEditDate())
			);

			saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
			List<Cars> carsList = carsMapper.selectList(new QueryWrapper<Cars>().lambda()
			.eq(Cars::getMemberId,member.getId())
			.eq(Cars::getIsdeleted,Constants.ONE)
			.eq(Cars::getAuthStatus,Constants.ONE)//已授权包期的车辆
			);
			if ((carsMapper!=null && carsList.size()>0)){
			for(Cars car :carsList){
			if(Constants.equalsInteger(car.getAuthStatus(),Constants.ZERO)){
			Cars model = new Cars();
			carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
			.eq(Cars::getId,car.getId())
			.set(Cars::getStartTime,null)
			.set(Cars::getEndTime,null)
			.set(Cars::getAuthTimeType,null)
			.set(Cars::getAuthStatus,Constants.ZERO)
			.set(Cars::getEditDate,model.getEditDate())
			.set(Cars::getEdirot,model.getEdirot())
			);
			//删除已授权下发的包期授权
			CarsServiceImpl.dealCancelBookBiz(car.getCode(),date,parkBookMapper);
			}
			}
			}
			}


			@@ -929,11 +958,11 @@
			.set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
			.set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
			.set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
			.set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
			.set(Member::getCode,updateMember.getCode())
			// .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
			.set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
			.set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
			.set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
			.set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
			.eq(Member::getId,updateMember.getId()));
			dealTrainTIme(updateMember,1,loginUserInfo);
			cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
			@@ -967,7 +996,7 @@

			public static void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper,String content) {
			updateMember.setEditDate(updateMember.getEditDate()==null?new Date():updateMember.getEditDate());
			UserAction userAction=new UserAction();
			UserAction userAction=new UserAction();
			userAction.setIsdeleted(Constants.ZERO);
			userAction.setCreateDate(updateMember.getEditDate());
			userAction.setCreator(updateMember.getEditor());
			@@ -1799,7 +1828,7 @@
			SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
			.eq(SystemUser::getOpenid,openId)
			.in(SystemUser::getType,Constants.memberType.internal)
			.eq(SystemUser::getDeleted,Boolean.FALSE)
			.eq(SystemUser::getDeleted,Constants.ZERO)
			.last(" limit 1 "));
			//非访客用户进行判断是否存在用户
			if(!Objects.isNull(user)){
			@@ -1828,7 +1857,7 @@
			SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
			.eq(SystemUser::getOpenid,openId)
			.in(SystemUser::getType,Constants.memberType.internal,Constants.memberType.driver)
			.eq(SystemUser::getDeleted,Boolean.FALSE)
			.eq(SystemUser::getDeleted,Constants.ZERO)
			.last(" limit 1 "));
			//非访客用户进行判断是否存在用户
			if(!Objects.isNull(user)){
			@@ -1860,7 +1889,7 @@
			.eq(SystemUser::getOpenid,openId)
			.eq(SystemUser::getType,source)
			// .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
			.eq(SystemUser::getDeleted,Boolean.FALSE)
			.eq(SystemUser::getDeleted,Constants.ZERO)
			.last(" limit 1 "));
			//非访客用户进行判断是否存在用户
			if(!Objects.isNull(user)){
			@@ -2048,7 +2077,7 @@
			ExcelImporter ie = null;
			List<MemberImport> dataList =null;
			try {
			ie = new ExcelImporter(file,2,0);
			ie = new ExcelImporter(file,1,0, CellType.STRING); // 确保单元格类型为字符串);
			dataList = ie.getDataList(MemberImport.class,null);
			} catch (Exception e) {
			e.printStackTrace();
			@@ -2118,6 +2147,10 @@
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息导入失败，请稍后重试！");
			}
			}

			public static void main(String[] args) {
			System.out.println(PhoneUtil.isPhone("18156047603"));
			}
			private Member checkModelParam(MemberImport model, List<Member> newList
			,int index
			,LoginUserInfo loginUserInfo
			@@ -2185,7 +2218,7 @@
			private Company findCompanyFromList(String companyName, List<Company> companyList) {
			if(companyList !=null){
			for(Company company : companyList){
			if(StringUtils.equals(companyName,company.getName())){
			if(StringUtils.equals(companyName,company.getCompanyNamePath())){
			return company;
			}
			}