fix(bug修复): 附件与在职员工

luoyb

2021-03-07 1b39b59699b8209e243ce151e5493b0b25f36ecb

fix(bug修复): 附件与在职员工

1.附件的关键字查询
2.在职员工高级查询中员工手册与工作证

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java

@@ -68,21 +68,40 @@
    @Override
    public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
         QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.delFlag", 0);
        if (StrUtil.isNotBlank(vo.getBasic())) {
            queryWrapper.like("a.empNumb", vo.getBasic()).or().like("a.deptName", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.jobName", vo.getBasic());
            queryWrapper.and(p -> {
                p.like("a.empNumb", vo.getBasic())
                        .or().like("a.deptName", vo.getBasic())
                        .or().like("a.certificateNumb", vo.getBasic())
                        .or().like("a.empName", vo.getBasic())
                        .or().like("a.jobName", vo.getBasic());
            });
        }
        if (StrUtil.isNotBlank(vo.getEmpName())) {
            queryWrapper.like("a.empName", vo.getEmpName().split(","));
            queryWrapper.like("a.empName", vo.getEmpName());
        }
        if (StrUtil.isNotBlank(vo.getEmpNumb())) {
            queryWrapper.like("a.empNumb", vo.getEmpNumb().split(","));
            queryWrapper.like("a.empNumb", vo.getEmpNumb());
        }
        if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
            queryWrapper.like("a.certificateNumb", vo.getCertificateNumb().split(","));
            queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
        }
        if (StrUtil.isNotBlank(vo.getDeptName())) {
            queryWrapper.like("a.deptName", vo.getDeptName().split(","));
            queryWrapper.like("a.deptName", vo.getDeptName());
        }
        // if (StrUtil.isNotBlank(vo.getEmpName())) {
        //     queryWrapper.like("a.empName", vo.getEmpName().split(","));
        // }
        // if (StrUtil.isNotBlank(vo.getEmpNumb())) {
        //     queryWrapper.like("a.empNumb", vo.getEmpNumb().split(","));
        // }
        // if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
        //     queryWrapper.like("a.certificateNumb", vo.getCertificateNumb().split(","));
        // }
        // if (StrUtil.isNotBlank(vo.getDeptName())) {
        //     queryWrapper.like("a.deptName", vo.getDeptName().split(","));
        // }
        if (StrUtil.isNotBlank(vo.getEntryDate())) {
            queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]);
        }
@@ -131,7 +150,7 @@
        if (StrUtil.isNotBlank(vo.getPolitics())) {
            queryWrapper.in("a.politics", vo.getPolitics().split(","));
        }
        queryWrapper.eq("a.delFlag", 0);

        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        queryWrapper.orderByAsc("a.deptName,a.empName,a.certificateNumb");
        Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java

@@ -845,6 +845,12 @@
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
            queryWrapper.in("a.empCardStatus", empBaseInfo.getEmpCardStatus().split(","));
        }
        if (StringUtils.isNotBlank(empBaseInfo.getHandbookStatus())) {
            queryWrapper.in("a.handBookStatus", empBaseInfo.getHandbookStatus().split(","));
        }
        // 下面的条件就是人员的属性条件，条件之间是或的关系
        if (this.checkQueryCondition(empBaseInfo)) {
            queryWrapper.and(p -> {