Merge remote-tracking branch 'origin/master'

jiangping

2025-01-06 93fc01349aa48a086c71123a2317765a925c0897

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -2,7 +2,6 @@

import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -20,11 +19,10 @@
import com.doumee.core.haikang.model.param.respose.UserAddResponse;
import com.doumee.core.haikang.model.param.respose.UserDelResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
@@ -33,16 +31,16 @@
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.response.MemberVO;
@@ -52,7 +50,6 @@
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.doumee.service.system.SystemLoginService;
import com.doumee.service.system.SystemUserService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.RandomStringUtils;
@@ -63,12 +60,11 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;
@@ -150,17 +146,22 @@
             if(dealHkUserBiz(insert)){
                memberMapper.insert(insert);
                //创建系统登陆账号（默认无任何角色）
                if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
//                if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
                    //如果是内部组织人员，新增系统登陆账号
                    systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
                    //处理培训有效期业务
                    dealTrainTIme(member,0,loginUserInfo);
                }
//                }
            }else{
                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
            }
        }catch (BusinessException e){
            //如果发生异常，删除已经创建的人员信息
            deleteHkUserBiz(new String[]{insert.getHkId()});
            throw  e;
        }catch (Exception e){
            //如果发生异常，删除已经创建的人员信息
            e.printStackTrace();
            deleteHkUserBiz(new String[]{insert.getHkId()});
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息新建失败，请稍后重试！");
        }
@@ -173,6 +174,7 @@
        // 生成密码
        user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
        user.setSalt(salt);
        user.setNeedChangePwd(Constants.ZERO);
        // 创建用户记录
        user.setType(insert.getType());
        user.setAvatar(insert.getFaceImg());
@@ -208,17 +210,22 @@
        insert.setCode(member.getCode());
        insert.setType(Constants.TWO);
        insert.setHkDate(new Date());
        insert.setWorkStatus(Constants.ONE);//默认在职
        insert.setWorkStatus(Constants.ZERO);//默认在职
        insert.setCanVisit(Constants.ZERO);//默认不可访问
        insert.setAuthStatus(Constants.ZERO);
        insert.setName(member.getName());
        insert.setHkId(UUID.randomUUID().toString().replace("-",""));
        insert.setHkStatus(Constants.ONE);
        insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//根据身份证号获取性别
        insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
        insert.setJobDate(member.getJobDate());
        insert.setIsDangyuan(member.getIsDangyuan());
        insert.setPositionId(member.getPositionId());
        if(StringUtils.isNotBlank(member.getIdcardNo())){
            insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
            insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//身份证号加密
            insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
        }
        insert.setPhone(member.getPhone());
        insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//身份证号加密
        insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
        insert.setStatus(Constants.ZERO);
        return  insert;
    }
@@ -242,7 +249,7 @@
     * @return
     */
    private boolean dealHkUserBiz(Member insert) {
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
        UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(insert,path,Constants.ZERO);
        if(hkAddRequest == null){
@@ -250,7 +257,7 @@
        }
        //处理新增数据
        BaseResponse<UserAddResponse> result =  HKService.addUser(hkAddRequest);
        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
        if(result!=null && StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
            insert.setHkId(hkAddRequest.getPersonId());
            insert.setFaceId(result.getData().getFaceId());
            if(StringUtils.isNotBlank(insert.getFaceId())){
@@ -265,7 +272,7 @@
        return false;
    }
    private boolean dealHkUserForUpdateBiz(Member update ) {
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();

        UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);
@@ -333,14 +340,16 @@
        if (StringUtils.isBlank(member.getPhone())||!PhoneUtil.isPhone(member.getPhone())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
        }
        if (StringUtils.isBlank(member.getIdcardNo())||!IdcardUtil.isValidCard(member.getIdcardNo())){
        if (StringUtils.isNotBlank(member.getIdcardNo()) && !IdcardUtil.isValidCard(member.getIdcardNo())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
        }
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
                .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
                .eq(Member::getIsdeleted,Constants.ZERO)) >0){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNo()+"】已被使用，不能重复");
        if(StringUtils.isNotBlank(member.getIdcardNo())){
            if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                    .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
                    .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
                    .eq(Member::getIsdeleted,Constants.ZERO)) >0){
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNo()+"】已被使用，不能重复");
            }
        }
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                .eq(Member::getPhone,  member.getPhone())
@@ -402,7 +411,8 @@
        }
        if (StringUtils.isNotBlank(member.getIdcardNoNew())){
            String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNoNew()));//身份证号加密
            if(!isDebug &&  !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
            if(!isDebug && StringUtils.isNotBlank(member.getIdcardNoNew()) &&
                    !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
                //如果发生改变，并且不合法，提示异常
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"修改的新身份证号格式有误");
            }
@@ -414,7 +424,6 @@
                        .ne(Member::getId,member.getId())) >0){
                    throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNoNew()+"】已被使用，不能重复");
                }

                member.setSex(Constants.getSexByCardNo( member.getIdcardNoNew()));//根据身份证号获取性别
                member.setIdcardDecode( Constants.getTuominStr(member.getIdcardNoNew()));
                member.setIdcardNo(encrptNo);
@@ -507,16 +516,7 @@
        if (PhoneUtil.isPhone(member.getPhone())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
        }
        if (IdcardUtil.isValidCard(member.getIdcardNo())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
        }
        if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"性别有误");
        }
        //获取出生日期
        String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
        //脱敏操作
        String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
//
        //转换日期
        Member insert = new Member();
        insert.setCreator(loginUserInfo.getId());
@@ -529,11 +529,23 @@
        insert.setImgurl(member.getImgurl());
        insert.setType(Constants.ZERO);
        insert.setName(member.getName());
        insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
        insert.setPhone(member.getPhone());
        insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
        IdcardUtil.isValidCard(member.getIdcardNo());
        insert.setIdcardDecode(hide);
        if(StringUtils.isNotBlank(member.getIdcardNo())){
            if (IdcardUtil.isValidCard(member.getIdcardNo())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
            }
            if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"性别有误");
            }
            //获取出生日期
            String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
            insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
            insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
            IdcardUtil.isValidCard(member.getIdcardNo());
            //脱敏操作
            String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
            insert.setIdcardDecode(hide);
        }
        insert.setStatus(Constants.ZERO);
        insert.setParentId(member.getParentId());
        memberMapper.insert(insert);
@@ -907,6 +919,10 @@
                    .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( 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);
@@ -939,6 +955,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.setIsdeleted(Constants.ZERO);
        userAction.setCreateDate(updateMember.getEditDate());
@@ -958,7 +975,7 @@
        wrapper.lambda().ne(Member::getRemark,"人脸已同步最新");
        List<Member> list =memberMapper.selectList(wrapper);
       if(list!=null){
           String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
           String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
                   +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
           for(Member m : list){
             String faceId=  HkSyncOrgUserToHKServiceImpl.dealMemberFace(m,path);
@@ -1082,6 +1099,7 @@
        update.setEditor(loginUserInfo.getId());
        update.setCanVisit(member.getCanVisit());
        memberMapper.updateById(update);
        member.setEditDate(update.getEditDate());
        //记录操作日志
        saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper,null);
    }
@@ -1113,17 +1131,29 @@
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,Member::getCompanyName) ;
        queryWrapper.selectAs(Position::getName,Member::getPositionName);
        queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        if(StringUtils.isNotBlank(member.getName())){
            queryWrapper.like(Member::getName,member.getName());
        }
        if(Objects.nonNull(member.getCompanyType())){
            queryWrapper.eq(Company::getType,member.getCompanyType());
        }
        if(StringUtils.isNotBlank(member.getCompanyTypes())){
            queryWrapper.in(Company::getType,Arrays.asList(member.getCompanyTypes().split(",")));
        }
        if(null != member.getType()) {
            queryWrapper.eq(Member::getType,member.getType());
        }
        if(null != member.getCompanyId()) {
            queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
        }
        if(null != member.getQuerySpecial() && Constants.equalsInteger(member.getQuerySpecial(),Constants.ONE)){
            String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
            if(StringUtils.isNotBlank(companySpecialId)){
                queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t3.company_path,'/',',')) ");
            }
        }
        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Member::getWorkStatus,Constants.ZERO);
@@ -1144,6 +1174,8 @@
                .eq(Member::getType,Constants.TWO)
                .exists("select b.id from car_driver b where b.isdeleted=0 and b.member_id=t.id");

        queryWrapper.selectAs(Position::getName,Member::getPositionName);
        queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
        if(null != member.getType()) {
            queryWrapper.eq(Member::getType,member.getType());
        }
@@ -1220,6 +1252,9 @@
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getPositionId() != null) {
            queryWrapper.lambda().eq(Member::getPositionId, pageWrap.getModel().getPositionId());
        }
        if (pageWrap.getModel().getBirthday() != null) {
            queryWrapper.lambda().ge(Member::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
@@ -1355,9 +1390,22 @@
        queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
        queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
        queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and  mc.member_id = t.id ) as  memberCardCount ");
        queryWrapper.select(" ( select max(tt.END_TIME) from train_time tt where tt.isdeleted = 0 and  tt.member_id = t.id ) as  trainEndTime ");

        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAs(Position::getName,Member::getPositionName);
        queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
        queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if( userInfo.getCompanyIdList().size() ==0){
                //只能看自己
                queryWrapper.eq(Member::getId,userInfo.getMemberId());
            }else{
                queryWrapper.in(Company::getId,userInfo.getCompanyIdList());
            }
        }
//        queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
        queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
                        Member::getCompanyId,pageWrap.getModel().getCompanyIds())
@@ -1370,9 +1418,11 @@
                .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
                .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .eq(Objects.nonNull(pageWrap.getModel().getWorkStatus()),Member::getWorkStatus,pageWrap.getModel().getWorkStatus())
                .eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
                .eq(Objects.nonNull(pageWrap.getModel().getCompanyType()),Company::getType,pageWrap.getModel().getCompanyType())
                .eq(Objects.nonNull(pageWrap.getModel().getPositionId()),Member::getPositionId,pageWrap.getModel().getPositionId())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
//                .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
//                .eq(Member::getType,Constants.memberType.internal)
@@ -1417,6 +1467,19 @@
                if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
                    memberInfoDTO.setImgurlFull(prefixUrl + memberInfoDTO.getImgurl());
                }
                memberInfoDTO.setHasFace(memberInfoDTO.getFaceId()!=null?Constants.ONE:Constants.ZERO);
                if(Constants.equalsInteger(Constants.ONE,memberInfoDTO.getAuthStatus())){
                    if(memberInfoDTO.getStartTime() ==null || memberInfoDTO.getEndTime() ==null ){
                        memberInfoDTO.setRoleTimeInfo("长期有效");
                    }else{
                        memberInfoDTO.setRoleTimeInfo(DateUtil.getPlusTime2(memberInfoDTO.getStartTime())+"至"+DateUtil.getPlusTime2(memberInfoDTO.getEndTime()));
                    }
                }else{
                    memberInfoDTO.setRoleTimeInfo("-");
                }
                memberInfoDTO.setAuthStatus(Constants.formatIntegerNum(memberInfoDTO.getAuthStatus()));
                memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
                memberInfoDTO.setSex(Constants.formatIntegerNum(memberInfoDTO.getSex()));
            }
        }
        return PageData.from(memberIPage);
@@ -1455,8 +1518,10 @@
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,Member::getCompanyName)
        .selectAs(Position::getName,Member::getPositionName)
         .leftJoin(Position.class,Position::getId,Member::getPositionId)
                .selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
                .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status  in (7,8) ) as visitsCount");
                .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status  in (7,8) ) as visitTimes");
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ms->ms.like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName())
@@ -1504,6 +1569,8 @@
                .eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
                .orderByDesc(Member::getCreateDate);

        queryWrapper.selectAs(Position::getName,Member::getPositionName);
        queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);

        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
        return PageData.from(memberIPage);
@@ -1592,9 +1659,11 @@
        }catch (Exception e){

        }
        List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>()
                .lambda().eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getType,Constants.memberType.internal)
        List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
                .selectAll(Member.class)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Company::getType,Constants.ZERO)
                .eq(Member::getStatus,Constants.ZERO)
                .isNotNull(Member::getHkId)
                .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
@@ -1633,6 +1702,7 @@
    /**
     * 微信授权接口
     * @param code
     * 来源:0=司机；1=访客；2=内部员工
     * @return
     */
    @Override
@@ -1644,50 +1714,83 @@
        String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
        String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code)
                .replace("APPID", appId).replace("SECRET", appSecret);
//        JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
        String openId = code;
//        if(!Objects.isNull(tokenJson.get("access_token"))){
//            openId = tokenJson.getString("openid");
//        }
//        String openId = "12345";
        JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
        String openId = "";
        if(Objects.nonNull(tokenJson)&&!Objects.isNull(tokenJson.get("access_token"))){
            openId = tokenJson.getString("openid");
        }
        WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
        if(StringUtils.isBlank(openId)){
            return wxAuthorizeVO;
        }
        wxAuthorizeVO.setOpenid(openId);
        //根据openId 查询用户信息
        Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
                .selectAll(Member.class)
                .selectAs(Company::getName,Member::getCompanyName)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .eq(Member::getOpenid,openId)
                .eq(Member::getType,source)
                .eq(Member::getIsdeleted,Constants.ZERO)
                .orderByDesc(Member::getCreateDate)
                .last(" limit 1 ")
        );
        //非访客用户 进行判断是否存在用户
        if(!Objects.isNull(member)){
            if(member.getIsdeleted() == Constants.ONE){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
            }
            if(member.getStatus() != Constants.ZERO){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
            }
            if(StringUtils.isNotBlank(member.getIdcardNo())){
               member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
            }
            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            member.setPrefixUrl(prefixUrl);
            wxAuthorizeVO.setMember(member);
            //司机 与 内部人员 提供token
            if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
                SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
                        .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
                if(Objects.nonNull(systemUser)){
                    String token = systemLoginService.loginByUserId(systemUser.getId());
                    wxAuthorizeVO.setToken(token);
        if(source==1){
            //根据openId 查询用户信息
            Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
                    .selectAll(Member.class)
                    .selectAs(Company::getName,Member::getCompanyName)
                    .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                    .eq(Member::getOpenid,openId)
                    .eq(Member::getType,source)
                    .eq(Member::getIsdeleted,Constants.ZERO)
                    .orderByDesc(Member::getCreateDate)
                    .last(" limit 1 ")
            );
            //非访客用户 进行判断是否存在用户
            if(!Objects.isNull(member)){
                if(member.getIsdeleted() == Constants.ONE){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
                }
                if(member.getStatus() != Constants.ZERO){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
                }
                if(StringUtils.isNotBlank(member.getIdcardNo())){
                    member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
                }
                String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                        systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
                member.setPrefixUrl(prefixUrl);
                wxAuthorizeVO.setMember(member);
                //司机 与 内部人员 提供token
                if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
                    SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
                            .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
                    if(Objects.nonNull(systemUser)){
                        String token = systemLoginService.loginByUserId(systemUser.getId());
                        wxAuthorizeVO.setToken(token);
                    }
                }
            }
        }else{
            //如果是司机或者内部人员，则从system_user查询
            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                    .eq(SystemUser::getOpenid,openId)
                    .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
                    .eq(SystemUser::getDeleted,Boolean.FALSE)
                    .last(" limit 1 "));
            //非访客用户 进行判断是否存在用户
            if(!Objects.isNull(user)){
                Member member = memberMapper.selectById(user.getMemberId());
                if(member.getIsdeleted() == Constants.ONE){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
                }
                if(member.getStatus() != Constants.ZERO){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
                }
                if(StringUtils.isNotBlank(member.getIdcardNo())){
                    member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
                }
                String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                        systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
                member.setPrefixUrl(prefixUrl);
                wxAuthorizeVO.setMember(member);
                //司机 与 内部人员 提供token
                String token = systemLoginService.loginByUserId(user.getId());
                wxAuthorizeVO.setToken(token);
            }
        }


        return wxAuthorizeVO;
    }

@@ -1700,12 +1803,15 @@
                .selectAll(Member.class)
                        .selectAs(Company::getName,Member::getCompanyName)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .selectAs(Position::getName,Member::getPositionName)
                .leftJoin(Position.class,Position::getId,Member::getPositionId)
                .eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile())
                .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getStatus,Constants.ZERO)
                .eq(Member::getWorkStatus,Constants.ZERO)
                .eq(Member::getCanVisit,Constants.ONE)
                .eq(Member::getType,Constants.memberType.internal) 
                .eq(Company::getType,Constants.ONE)
        );
        List<MemberVO> memberVOList = new ArrayList<>();
        if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
@@ -1814,7 +1920,7 @@
            ExcelImporter ie = null;
            List<MemberImport> dataList =null;
            try {
                ie = new ExcelImporter(file,1,0);
                ie = new ExcelImporter(file,2,0);
                dataList = ie.getDataList(MemberImport.class,null);
            }  catch (Exception e) {
                e.printStackTrace();
@@ -1831,6 +1937,8 @@
            List<Member> newList = new ArrayList<>();
            for(int i=0;i<dataList.size();i++){
                MemberImport model = dataList.get(i);
                model.setPhone(ScientificNotationTUtil.convertToString(model.getPhone()));
                model.setIdcardNo(ScientificNotationTUtil.convertToString(model.getIdcardNo()));
                if(StringUtils.isBlank(model.getName())
                       &&StringUtils.isBlank(model.getIdcardNo())
                        &&StringUtils.isBlank(model.getPhone())
@@ -1868,10 +1976,10 @@
            List<SystemUser> userList = new ArrayList<>();
            for(Member insert: newList){
                //创建系统登陆账号（默认无任何角色）
                if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
//                if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
                    //如果是内部组织人员，新增系统登陆账号
                    userList.add(createSystemUser(insert,systemDictDataBiz));
                }
//                }
            }
            if(userList.size()>0){
                systemUserMapper.insert(userList);
@@ -1889,7 +1997,7 @@
            ,List<Company> companyList
            ,Integer companyType) {
        if(StringUtils.isBlank(model.getName())
                ||StringUtils.isBlank(model.getIdcardNo())
//                ||StringUtils.isBlank(model.getIdcardNo())
                ||StringUtils.isBlank(model.getPhone())
                ||StringUtils.isBlank(model.getCompanyName())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行人员信息不完整，请检查表格内容！");
@@ -1897,12 +2005,22 @@
        if (!PhoneUtil.isPhone(model.getPhone())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】格式不正确，请检查表格内容！");
        }
        if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】格式不正确，请检查表格内容！");
        if(model.getPhone().indexOf(".")>=Constants.ZERO){
            model.setPhone(
                    String.valueOf(new BigDecimal(model.getPhone()).intValue())
            );
        }
        if(StringUtils.isNotBlank(model.getIdcardNo())){
            if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】格式不正确，请检查表格内容！");
            }
        }

        for(Member member: newList){
            if(StringUtils.equals(model.getIdcardNo(),member.getIdcardNo())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】重复出现，请检查表格内容！");
            if(StringUtils.isNotBlank(model.getIdcardNo())&&StringUtils.isNotBlank(member.getIdcardNo())) {
                if (StringUtils.equals(model.getIdcardNo(), member.getIdcardNo())) {
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，第" + (index + 3) + "行身份证号【" + model.getIdcardNo() + "】重复出现，请检查表格内容！");
                }
            }
            if(StringUtils.equals(model.getPhone(),member.getPhone())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】重复出现，请检查表格内容！");
@@ -1916,9 +2034,12 @@
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行组织名称【"+model.getCompanyName()+"】类型不正确，请检查表格内容！");
        }
        String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
        if(findMemberFromListByIdcard(candNo,memberList ) !=null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】已存在，请检查表格内容！");
        if(StringUtils.isNotBlank(model.getIdcardNo())){
            if(findMemberFromListByIdcard(candNo,memberList ) !=null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】已存在，请检查表格内容！");
            }
        }

        if(findMemberFromListByPhone(model.getPhone(),memberList ) !=null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】已存在，请检查表格内容！");
        }
@@ -1978,6 +2099,7 @@
        }
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                .eq(Member::getIsdeleted,Constants.ZERO)
                .ne(Member::getType,Constants.memberType.visitor)
                .eq(Member::getPhone,registerDriverDTO.getPhone())
        )>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"手机号已注册!");
@@ -1988,14 +2110,13 @@
        )>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"手机号已注册!");
        };

        smsEmailService.validateCode(registerDriverDTO.getValidCode(),registerDriverDTO.getPhone());
        String salt = RandomStringUtils.randomAlphabetic(6);
       ;
        Member member = new Member();
        member.setCreateDate(new Date());
        member.setIsdeleted(Constants.ZERO);
        member.setType(Constants.THREE);
        member.setType(Constants.memberType.driver);
        member.setName(registerDriverDTO.getName());
        member.setPhone(registerDriverDTO.getPhone());
        member.setStatus(Constants.ZERO);
@@ -2013,6 +2134,7 @@
        systemUser.setSalt(salt);
        systemUser.setPassword(member.getPassward());
        systemUser.setStatus(Constants.ZERO);
        systemUser.setType(Constants.memberType.driver);
        systemUser.setSource(Constants.TWO);
        systemUserMapper.insert(systemUser);