员工列表

liuleilei

2023-12-13 a0ade3c35b7413054e642429229c5e65ac21f4ca

员工列表

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

@@ -86,6 +86,14 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("是否可拜访状态修改")
    @PostMapping("/updateCanVisitById")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateCanVisitById(@RequestBody Member member){
        memberService.updateCanVisitById(member);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:member:query")
@@ -122,8 +130,8 @@
     * @return
     */
    @ApiOperation("分页查询内部人员信息")
    @GetMapping("/findMemberInfoPage")
    @RequiresPermissions("business:member:query")
    @PostMapping("/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

@@ -5,6 +5,7 @@
import io.swagger.models.auth.In;
import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
@@ -12,7 +13,7 @@
 */
@Data
@ApiModel("人员查询 参数")
public class MemberQuery {
public class MemberQuery implements Serializable {

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

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

@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
@@ -13,7 +14,7 @@
 */
@Data
@ApiModel("劳务人员信息表")
public class MemberInfoDTO {
public class MemberInfoDTO implements Serializable {

    @ApiModelProperty(value = "主键")
    private Integer id;

 server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java

@@ -1,7 +1,13 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @author 江蹄蹄
@@ -9,4 +15,14 @@
 */
public interface MemberMapper extends BaseMapper<Member> {


    @Select(" select m.* , c.name as companyName , d.name as roleName, " +
            " (select count(0) from member_card mc where mc.MEMBER_ID=m.id and mc.ISDELETED=0) as memberCardCount  " +
            " from member m  " +
            " left join company c on m.COMPANY_ID=c.id "+
            " left join device_role d on d.id=m.ROLE_ID "+
            " ${ew.customSqlSegment} ")
    IPage<MemberInfoDTO> getPage(IPage<MemberInfoDTO> page, @Param(Constants.WRAPPER) Wrapper wrapper);


}

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

@@ -61,7 +61,7 @@
    private String faceImg;
    @ApiModelProperty(value = "人脸存储服务器标识（海康）")
    @ExcelColumn(name="人脸存储服务器标识（海康）")
    private String faceServeIndexCode;
    private String faceServerIndexCode;
    @ApiModelProperty(value = "人脸编码（海康）")
    @ExcelColumn(name="人脸编码（海康）")
    private String faceId;

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

@@ -73,6 +73,7 @@
     */
    void updateStatusById(Member member);

    void updateCanVisitById(Member member);
    /**
     * 批量主键更新
     *

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

@@ -29,6 +29,9 @@
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -39,6 +42,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -164,6 +168,17 @@
        memberMapper.updateById(update);
    }


    @Override
    public void updateCanVisitById(Member member) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member update = new Member();
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setCanVisit(member.getCanVisit());
        memberMapper.updateById(update);
    }

    @Override
    public void updateByIdInBatch(List<Member> members) {
        if (CollectionUtils.isEmpty(members)) {
@@ -193,6 +208,7 @@

    @Override
    public PageData<Member> findPage(PageWrap<Member> pageWrap) {

        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
@@ -386,31 +402,35 @@

    @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());
        boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());*/

        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
      /*  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);
                .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 ");
             *//*   .select("count(t3.id) as memberCardCount ");*//*
                .select("");

        queryWrapper.in(Objects.nonNull(model.getCompanyIds()),Member::getCompanyId,model.getCompanyIds())
                    .like(number,Member::getPhone,model.getKeyWords())
                    .like((b||hasWord),Member::getPhone,model.getKeyWords())
              *//*      .like(number,Member::getPhone,model.getKeyWords())
                    .like((b||hasWord),Member::getPhone,model.getKeyWords())*//*
                     .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),ms->ms.like(Member::getPhone,model.getKeyWords())
                     .or().like(Member::getName,model.getKeyWords())
                     .or().like(Member::getCode,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())
@@ -418,7 +438,19 @@
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
            memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
        }
        }*/
        IPage<MemberInfoDTO> memberIPage = memberMapper.getPage(pageWrap.toPage(),new QueryWrapper<MemberInfoDTO>()
                .in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,"m.COMPANY_ID",pageWrap.getModel().getCompanyIds())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),ms->ms.like("m.ohone",pageWrap.getModel().getKeyWords())
                        .or().like("m.name",pageWrap.getModel().getKeyWords())
                        .or().like("m.code",pageWrap.getModel().getKeyWords()))
                .isNull(Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),"m.FACE_ID")
                .isNotNull(Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),"m.FACE_ID")
                .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),"m.CAN_VISIT",pageWrap.getModel().getCanVisit())
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),"m.CAN_VISIT",pageWrap.getModel().getStatus())
                .eq("m.ISDELETED",0)
                .orderByDesc("m.CREATE_DATE")
        );
        return PageData.from(memberIPage);
    }