员工列表

liuleilei

2023-12-22 2171b863a08342949a022c2b0335e5ac03ef7516

员工列表

 server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemUserController.java

@@ -113,10 +113,12 @@



    @ApiOperation("分页查询系统用户")


    @ApiOperation("查询所有系统用户")
    @PostMapping("/findAllList")
    @RequiresPermissions("system:user:query")
    public ApiResponse<PageData<SystemUser>> findAllList (@RequestBody PageWrap<SystemUser> pageWrap) {
    public ApiResponse<List<SystemUser>> findAllList (@RequestBody SystemUser pageWrap) {
        return ApiResponse.success(systemUserService.findAllList(pageWrap));
    }


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

@@ -49,4 +49,7 @@
    @ApiModelProperty(value = " 工号员")
    private Integer code;

    @ApiModelProperty(value = "操作人员 ")
    private Integer createrId;

}

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

@@ -222,7 +222,7 @@
        Member update = new Member();
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setStatus(member.getStatus());
        update.setStatus(Constants.Status.FREEZE.getValue());
        update.setId(member.getId());
        memberMapper.updateById(update);

@@ -253,7 +253,7 @@
            Member update = new Member();
            update.setEditDate(date);
            update.setEditor(loginUserInfo.getId());
            update.setStatus(s.getStatus());
            update.setStatus(Constants.Status.ENABLE.getValue());
            update.setId(s.getId());
            memberMapper.updateById(update);

@@ -623,18 +623,22 @@
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getCreator);
        queryWrapper.selectAs(SystemUser::getUsername,MemberInfoDTO::getCreatorName);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                .select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 and ua.type=1 order by ua.CREATE_DATE limit 1) as userActionType1")
             /*   .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0) as visitsCount")*/
                .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE limit 1) as visitsLastDate");

                queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCreaterId()),Member::getEditor,pageWrap.getModel().getCreaterId());
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
        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().getKeyWords()),ms->ms.like(Member::getPhone,pageWrap.getModel().getName())
                        .or().like(Member::getName,pageWrap.getModel().getName()))
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
                .eq(Member::getStatus,Constants.Status.ENABLE)
                .eq(Member::getStatus,Constants.Status.FREEZE.getValue())
                .eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
                .orderByDesc(Member::getCreateDate);


 server/dmvisit_service/src/main/java/com/doumee/service/system/SystemUserService.java

@@ -78,7 +78,7 @@
     */
    PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap);

    PageData<SystemUser> findAllList(PageWrap<SystemUser> pageWrap);
    List<SystemUser> findAllList(SystemUser pageWrap);

    /**
     * 条件统计

 server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java

@@ -206,24 +206,24 @@


    @Override
    public PageData<SystemUser> findAllList(PageWrap<SystemUser> pageWrap) {
    public List<SystemUser> findAllList(SystemUser pageWrap) {

        IPage<SystemUser> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());

        MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        Utils.MP.blankToNull(pageWrap);
        queryWrapper.selectAll(SystemUser.class);
        queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getModel().getUsername())
        .or().like(SystemUser::getMobile,pageWrap.getModel().getUsername())
                .or().like(SystemUser::getRealname,pageWrap.getModel().getUsername())
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getUsername())
        .or().like(SystemUser::getMobile,pageWrap.getUsername())
                .or().like(SystemUser::getRealname,pageWrap.getUsername())
        );
        queryWrapper.orderByDesc(SystemUser::getCreateTime);



        IPage<SystemUser> result = systemUserJoinMapper.selectJoinPage(page, SystemUser.class, queryWrapper);
        List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);

        return PageData.from(result);
        return result;
    }