jiangping
2025-01-16 f63d3a3be83fea258e7920efccd2567b6a511bb3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -196,6 +196,7 @@
        user.setSource(Constants.ZERO);
        user.setDeleted(Boolean.FALSE);
        user.setFixed(Boolean.FALSE);
        user.setPinyin(Constants.getChinesePingyin(user.getRealname()));
        user.setStatus(Constants.ZERO);
        return user;
    }
@@ -224,6 +225,7 @@
        insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//根据身份证号获取性别
        insert.setJobDate(member.getJobDate());
        insert.setIsDangyuan(member.getIsDangyuan());
        insert.setPinyin(Constants.getChinesePingyin(member.getName()));
        insert.setPositionId(member.getPositionId());
        if(StringUtils.isNotBlank(member.getIdcardNo())){
            insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
@@ -482,6 +484,7 @@
                            .set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
                            .set(SystemUser::getUpdateTime,new Date())
                            .set(StringUtils.isNotBlank(member.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
                            .set(StringUtils.isNotBlank(member.getName()),SystemUser::getPinyin,Constants.getChinesePingyin(member.getName()))
                            .set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getMobile,member.getPhone())
                            .set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getUsername,member.getPhone())
                            .set(StringUtils.isNotBlank(member.getName()),SystemUser::getRealname,member.getName())
@@ -511,6 +514,8 @@
            //如果人脸没变化
            member.setFaceImg(null);
        }
        member.setPinyin(Constants.getChinesePingyin(member.getName()));
        return model;
    }
@@ -897,7 +902,7 @@
            loginUserInfo = updateMember.getLoginUserInfo();
        }
        //校验参数 并且更新systemuser 手机号和工号信息(如果需要修改的话)
         Member model =   isMemberUpdateParamValid(updateMember);
        Member model =   isMemberUpdateParamValid(updateMember);
        updateMember.setEditor(loginUserInfo.getId());
        updateMember.setEditDate(new Date());
        //海康人员新增业务
@@ -912,6 +917,7 @@
                    .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
                    .set(Member::getEditDate,updateMember.getEditDate())
                    .set(Member::getEditor,updateMember.getEditor())
                    .set(StringUtils.isNotBlank(updateMember.getName()),Member::getPinyin,Constants.getChinesePingyin(updateMember.getName()))
                    .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
                    .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
                    .set( Member::getAuthStatus,Constants.ZERO)
@@ -1162,6 +1168,7 @@
        }
        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Member::getWorkStatus,Constants.ZERO);
        queryWrapper.orderByAsc(Member::getPinyin);
        List<Member> list =  memberJoinMapper.selectJoinList(Member.class,queryWrapper);
//        if(list!=null){
//            for(Member m : list){
@@ -1188,6 +1195,7 @@
            queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
        }
        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
        queryWrapper.orderByAsc(Member::getPinyin);
        List<Member> list =  memberJoinMapper.selectJoinList(Member.class,queryWrapper);
        if(list!=null){
            for(Member m : list){
@@ -1195,6 +1203,46 @@
            }
        }
        return  list;
    }
    @Override
    public  void initPinyinTool(){
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        List<Member> list =  memberJoinMapper.selectList(queryWrapper);
        if(list!=null){
            for(Member m : list){
               if(m.getName()!=null){
                   Member u = new Member();
                   u.setId(m.getId());
                   u.setPinyin(Constants.getChinesePingyin(m.getName()));
                   memberMapper.updateById(u);
               }
            }
        }
        MPJLambdaWrapper<SystemUser> q1 = new MPJLambdaWrapper<>();
        List<SystemUser> list1 =  systemUserMapper.selectList(q1);
        if(list1!=null){
            for(SystemUser m : list1){
                if(m.getRealname()!=null){
                    SystemUser u = new SystemUser();
                    u.setId(m.getId());
                    u.setPinyin(Constants.getChinesePingyin(m.getRealname()));
                    systemUserMapper.updateById(u);
                }
            }
        }
        MPJLambdaWrapper<Company> q2 = new MPJLambdaWrapper<>();
        List<Company> list2 =  companyMapper.selectList(q2);
        if(list2!=null){
            for(Company m : list2){
                if(m.getName()!=null){
                    Company u = new Company();
                    u.setId(m.getId());
                    u.setPinyin(Constants.getChinesePingyin(m.getName()));
                    companyMapper.updateById(u);
                }
            }
        }
    }
    @Override
@@ -1432,7 +1480,7 @@
//                .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
//                .eq(Member::getType,Constants.memberType.internal)
                .eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .orderByDesc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
                .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
                .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
            queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
@@ -1538,7 +1586,7 @@
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
                .eq(Member::getType,Constants.memberType.visitor)
                .eq(Member::getIsdeleted,Constants.ZERO)
                .orderByDesc(Member::getCreateDate);
                .orderByAsc(Member::getPinyin);
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
            queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
        }else{
@@ -1576,7 +1624,7 @@
        queryWrapper.selectAs(Position::getName,Member::getPositionName);
        queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
        queryWrapper.orderByAsc(Member::getPinyin);
        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
        return PageData.from(memberIPage);
@@ -1669,9 +1717,11 @@
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Company::getType,Constants.ZERO)
                .eq(Member::getStatus,Constants.ZERO)
                .eq(Member::getStatus,Constants.ZERO
                )
                .isNotNull(Member::getHkId)
                .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
                .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" )
                .orderByAsc(Member::getPinyin));
        if(CollectionUtils.isEmpty(memberList)){
           return;
        }
@@ -1888,6 +1938,7 @@
                .eq(Member::getWorkStatus,Constants.ZERO)
                .eq(Member::getCanVisit,Constants.ONE)
                .eq(Company::getType,Constants.ONE)
                .orderByAsc(Member::getPinyin)
        );
        List<MemberVO> memberVOList = new ArrayList<>();
        if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
@@ -1924,7 +1975,8 @@
            queryWrapper.and(StringUtils.isNotBlank(visitMemberDTO.getName()), ms->ms.like(Member::getPhone,visitMemberDTO.getName())
                    .or().like(Member::getPhone,visitMemberDTO.getName()));
        }
        queryWrapper.orderByDesc(Visits::getCreateDate);
        queryWrapper.orderByAsc(Member::getPinyin);
//      queryWrapper.orderByDesc(Visits::getCreateDate);
        IPage<MemberVO> result = memberJoinMapper.selectJoinPage(page, MemberVO.class,queryWrapper);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +