#组织树 和企业下的人员信息 人员卡信息

jiaosong

2023-12-08 30a14783481d100a6503a56c902b47182e542c93

#组织树 和企业下的人员信息 人员卡信息

 server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
import com.doumee.service.business.CompanyService;
import io.swagger.annotations.Api;
@@ -107,4 +108,18 @@
        company.setCategoryId(query.getCategoryId());
        return ApiResponse.success(companyService.findList(company));
    }


    /**
     * æŸ¥è¯¢éƒ¨é—¨åŠå…¶å­éƒ¨é—¨ä¿¡æ¯
     * @param type 0 æŸ¥è¯¢æ‰€æœ‰ä¿¡æ¯ 1 æŸ¥è¯¢å†…部信息
     * @return
     */
    @ApiOperation("根据类型查询组织信息")
    @GetMapping("/findCompanyTreePage")
//    @RequiresPermissions("business:company:query")
    public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
        return ApiResponse.success(companyService.findCompanyTreePage(type));
    }

}

 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
@@ -112,4 +113,18 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(memberService.findById(id));
    }


    /**
     *
     * åˆ†é¡µæŸ¥è¯¢å†…部人员信息
     * @param pageWrap
     * @return
     */
    @ApiOperation("分页查询内部人员信息")
    @GetMapping("/findMemberInfoPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
        return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
    }
}

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.doumee.dao.admin.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;

import java.util.List;

/**
 * @author T14
 */
@Data
@ApiModel("人员查询 å‚æ•°")
public class MemberQuery {

    @ApiModelProperty(value = "姓名/手机号/工号")
    private String keyWords;

    @ApiModelProperty(value = "是否有人脸 0 å¦ 1 æ˜¯")
    private Integer hasFace;

    @ApiModelProperty(value = "可拜访")
    private Integer canVisit;

    @ApiModelProperty(value = "状态")
    private Integer status;

    @ApiModelProperty(value = "公司IDs")
    private List<Integer> companyIds;

}

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CompanyDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
package com.doumee.dao.admin.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author T14
 */
@Data
@ApiModel("组织模型")
public class CompanyDTO {


    @ApiModelProperty(value = "名称")
    private String name;

    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "状态 0启用 1禁用")
    private Integer status;

    @ApiModelProperty(value = "排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "劳务人数")
    private Integer countNum;

    @ApiModelProperty(value = "图标")
    private String imgurl;

    @ApiModelProperty(value = "类型 0劳务公司 1内部组织")
    private Integer type;

    @ApiModelProperty(value = "分类编码(关联category)")
    private Integer categoryId;

    @ApiModelProperty(value = "分类编码名称")
    private String categoryName;

    @ApiModelProperty(value = "企业代码")
    private Integer code;

    @ApiModelProperty(value = "上级组织编码（自关联）")
    private Integer parentId;

    @ApiModelProperty(value = "联系人姓名")
    private String linkName;

    @ApiModelProperty(value = "联系电话")
    private String linkPhone;

    @ApiModelProperty(value = "子部门")
    private List<CompanyDTO> companyDTOList;
}

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java

@@ -82,6 +82,19 @@
    @ApiModelProperty(value = "微信openid")
    private String openid;

    @ApiModelProperty(value = "门禁角色编码")
    private Integer roleId;

    @ApiModelProperty(value = "门禁角色名称")
    private String roleName;

    @ApiModelProperty(value = "是否可拜访人 0否 1是")
    private String canVisit;


    @ApiModelProperty(value = "卡片数")
    private Integer memberCardCount;

    @ApiModelProperty(value = "培训有效期结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date trainTimeEndTime;

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.doumee.dao.business.join;

import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.dao.business.model.MemberCard;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.springframework.stereotype.Repository;

/**
 * @author T14
 */
@Repository
public interface MemberCardJoinMapper extends MPJJoinMapper<MemberCard> {
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,11 +22,11 @@
public class MemberCard {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ApiModelProperty(value = "主键")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ApiModelProperty(value = "创建人编码")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

@@ -34,7 +35,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ApiModelProperty(value = "更新人编码")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

@@ -43,7 +44,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ApiModelProperty(value = "是否删除0否 1是")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

@@ -51,9 +52,24 @@
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "用户编码（关联member表)", example = "1")
    @ApiModelProperty(value = "用户编码（关联member表)")
    @ExcelColumn(name="用户编码（关联member表)")
    private Integer memberId;

    @ApiModelProperty(value = "用户编码名称")
    @ExcelColumn(name="用户编码名称")
    @TableField(exist = false)
    private String memberName;

    @ApiModelProperty(value = "用户电话")
    @ExcelColumn(name="用户电话")
    @TableField(exist = false)
    private String memberPhone;

    @ApiModelProperty(value = "公司组织名称")
    @ExcelColumn(name="公司组织名称")
    @TableField(exist = false)
    private String companyName;

    @ApiModelProperty(value = "卡号")
    @ExcelColumn(name="卡号")
@@ -63,11 +79,11 @@
    @ExcelColumn(name="卡密")
    private String passward;

    @ApiModelProperty(value = "海康标识", example = "1")
    @ApiModelProperty(value = "海康标识")
    @ExcelColumn(name="海康标识")
    private String hkId;

    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步", example = "1")
    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步")
    @ExcelColumn(name="海康同步状态 0未同步 1已同步")
    private Integer hkStatus;

@@ -76,8 +92,12 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date hkDate;

    @ApiModelProperty(value = "状态 0禁用 1启用", example = "1")
    @ApiModelProperty(value = "状态 0禁用 1启用")
    @ExcelColumn(name="状态 0禁用 1启用")
    private Integer status;


    @ApiModelProperty(value = "关键字")
    @TableField(exist = false)
    private String KeyWords;
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java

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

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
import java.util.List;

@@ -110,4 +111,11 @@
     * @return long
     */
    long count(Company company);

    /**
     * æŸ¥è¯¢éƒ¨é—¨åŠå…¶å­éƒ¨é—¨ä¿¡æ¯
     * @param type 0 æŸ¥è¯¢æ‰€æœ‰ä¿¡æ¯ 1 æŸ¥è¯¢å†…部信息
     * @return
     */
    List<CompanyDTO> findCompanyTreePage(Integer type);
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java

@@ -5,6 +5,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.response.WxAuthorizeVO;
@@ -136,6 +137,14 @@
    void importMemberBatch(LaborEmpowerDTO laborEmpowerDTO);


    /**
     *
     * åˆ†é¡µæŸ¥è¯¢å†…部人员信息
     * @param pageWrap
     * @return
     */
    PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);



    /********************************************公众号接口***********************************************************************/

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

@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -7,6 +9,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Category;
@@ -18,13 +21,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * ä¼ä¸šä¿¡æ¯è¡¨Service实现
@@ -245,6 +253,41 @@
        return companyMapper.selectCount(wrapper);
    }


    @Override
    public List<CompanyDTO> findCompanyTreePage(Integer type) {

        LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();

        wrapper.eq(Company::getIsdeleted,Constants.ZERO)
                .eq(Constants.equalsInteger(type,Constants.ONE),Company::getType,type);
        List<Company> companies = companyMapper.selectList(wrapper);
        return getCompanyTree( companies, null);
    }


    private List<CompanyDTO> getCompanyTree(List<Company> companies, Integer parentId){
        if (CollectionUtils.isEmpty(companies)){
            return null;
        }
        List<Company> collect = companies.stream()
                                        .filter(s -> Constants.equalsInteger(s.getParentId(), parentId))
                                        .collect(Collectors.toList());
        if (CollectionUtils.isEmpty(companies)){
            return null;
        }
        List<CompanyDTO> companyDTOList = new ArrayList<>();
        for (int i = 0; i < collect.size(); i++) {
            Company company = collect.get(i);
            CompanyDTO companyDTO = new CompanyDTO();
            BeanUtils.copyProperties(company,companyDTO);
            companyDTO.setCompanyDTOList(getCompanyTree(companies, company.getId()));
            companyDTOList.add(companyDTO);
        }
        return companyDTOList;
    }


    /**
     * åŠ³åŠ¡å…¬å¸å”¯ä¸€æ€§æ ¡éªŒ
     * @param company

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

@@ -1,20 +1,28 @@
package com.doumee.service.business.impl;

import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberCardMapper;
import com.doumee.dao.business.join.MemberCardJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.service.business.MemberCardService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.Objects;

/**
 * ç”¨æˆ·å¡ç‰‡ç»‘定信息表Service实现
@@ -26,6 +34,9 @@

    @Autowired
    private MemberCardMapper memberCardMapper;

    @Autowired
    private MemberCardJoinMapper memberCardJoinMapper;

    @Override
    public Integer create(MemberCard memberCard) {
@@ -83,65 +94,79 @@
        QueryWrapper<MemberCard> wrapper = new QueryWrapper<>(memberCard);
        return memberCardMapper.selectList(wrapper);
    }
  

    @Override
    public PageData<MemberCard> findPage(PageWrap<MemberCard> pageWrap) {
        IPage<MemberCard> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<MemberCard> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<MemberCard> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(MemberCard::getId, pageWrap.getModel().getId());
            queryWrapper.eq(MemberCard::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(MemberCard::getCreator, pageWrap.getModel().getCreator());
            queryWrapper.eq(MemberCard::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(MemberCard::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(MemberCard::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
            queryWrapper.ge(MemberCard::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.le(MemberCard::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(MemberCard::getEditor, pageWrap.getModel().getEditor());
            queryWrapper.eq(MemberCard::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(MemberCard::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(MemberCard::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
            queryWrapper.ge(MemberCard::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.le(MemberCard::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(MemberCard::getIsdeleted, pageWrap.getModel().getIsdeleted());
            queryWrapper.eq(MemberCard::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(MemberCard::getRemark, pageWrap.getModel().getRemark());
            queryWrapper.eq(MemberCard::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getMemberId() != null) {
            queryWrapper.lambda().eq(MemberCard::getMemberId, pageWrap.getModel().getMemberId());
            queryWrapper.eq(MemberCard::getMemberId, pageWrap.getModel().getMemberId());
        }
        if (pageWrap.getModel().getCode() != null) {
            queryWrapper.lambda().eq(MemberCard::getCode, pageWrap.getModel().getCode());
            queryWrapper.eq(MemberCard::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getPassward() != null) {
            queryWrapper.lambda().eq(MemberCard::getPassward, pageWrap.getModel().getPassward());
            queryWrapper.eq(MemberCard::getPassward, pageWrap.getModel().getPassward());
        }
        if (pageWrap.getModel().getHkId() != null) {
            queryWrapper.lambda().eq(MemberCard::getHkId, pageWrap.getModel().getHkId());
            queryWrapper.eq(MemberCard::getHkId, pageWrap.getModel().getHkId());
        }
        if (pageWrap.getModel().getHkStatus() != null) {
            queryWrapper.lambda().eq(MemberCard::getHkStatus, pageWrap.getModel().getHkStatus());
            queryWrapper.eq(MemberCard::getHkStatus, pageWrap.getModel().getHkStatus());
        }
        if (pageWrap.getModel().getHkDate() != null) {
            queryWrapper.lambda().ge(MemberCard::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
            queryWrapper.lambda().le(MemberCard::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
            queryWrapper.ge(MemberCard::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
            queryWrapper.le(MemberCard::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(MemberCard::getStatus, pageWrap.getModel().getStatus());
            queryWrapper.eq(MemberCard::getStatus, pageWrap.getModel().getStatus());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(memberCardMapper.selectPage(page, queryWrapper));
        queryWrapper.orderByDesc(MemberCard::getCreateDate);

        //是否是数字
        boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
        //是否包含中文
        boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
        //是否包含英文
        boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());

        queryWrapper.leftJoin(Member.class,Member::getId,MemberCard::getMemberId)
                    .leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(MemberCard.class)
                    .selectAs(Member::getName,MemberCard::getMemberName)
                    .selectAs(Member::getPhone,MemberCard::getMemberPhone)
                    .selectAs(Company::getName,MemberCard::getCompanyName);
        queryWrapper.like(Objects.nonNull(pageWrap.getModel().getCode()),MemberCard::getCode,pageWrap.getModel().getCode())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
                    .like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
                    .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords());
        IPage<MemberCard> memberCardIPage = memberCardJoinMapper.selectJoinPage(page, MemberCard.class,queryWrapper);
        return PageData.from(memberCardIPage);
    }

    @Override

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

@@ -2,8 +2,11 @@

import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import cn.hutool.core.util.ReUtil;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.Jwt.JwtPayLoad;
@@ -20,14 +23,12 @@
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Empower;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.TrainTime;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -383,8 +384,43 @@

    }

    @Override
    public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {

        //是否是数字
        boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
        //是否包含中文
        boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
        //是否包含英文
        boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());

        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        MemberQuery model = pageWrap.getModel();
        Utils.MP.blankToNull(model);

        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .leftJoin(DeviceRole.class,DeviceRole::getId,Member::getRoleId)
                .leftJoin(MemberCard.class,MemberCard::getMemberId,Member::getId);

        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                .selectAs(DeviceRole::getName,MemberInfoDTO::getRoleName)
                .select("count(t3.id) as memberCardCount ");

        queryWrapper.in(Objects.nonNull(model.getCompanyIds()),Member::getCompanyId,model.getCompanyIds())
                    .like(number,Member::getPhone,model.getKeyWords())
                    .like((b||hasWord),Member::getPhone,model.getKeyWords())
                    .isNull(Constants.equalsInteger(model.getHasFace(),Constants.ZERO),Member::getFaceId)
                    .isNotNull(Constants.equalsInteger(model.getHasFace(),Constants.ONE),Member::getFaceId)
                    .eq(Objects.nonNull(model.getCanVisit()),Member::getCanVisit,model.getCanVisit())
                    .eq(Objects.nonNull(model.getStatus()),Member::getStatus,model.getStatus());
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
            memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
        }
        return PageData.from(memberIPage);
    }

    /********************************************公众号接口***********************************************************************/