修改bug

yz_08

2021-03-03 ce96649e79bf730aef73f3bec205c1c00a743635

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

@@ -41,21 +41,10 @@
            .orElse("1");

    @Override
    public IPage<EmpDimissionLog> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog) {
    public IPage<Map<String, Object>> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog) {
        LambdaQueryWrapper<EmpDimissionLog> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpDimissionLog::getDelFlag, 0);
//        if (StringUtils.isNotBlank(empDimissionlog.getEmpNumb())) {
//            queryWrapper.like(EmpDimissionLog::getEmpNumb, empDimissionlog.getEmpNumb());
//        }
//        if (StringUtils.isNotBlank(empDimissionlog.getEmpName())) {
//            queryWrapper.like(EmpDimissionLog::getEmpName, empDimissionlog.getEmpName());
//        }
//        if (StringUtils.isNotBlank(empDimissionlog.getCertificateNumb())) {
//            queryWrapper.like(EmpDimissionLog::getCertificateNumb, empDimissionlog.getCertificateNumb());
//        }
//        if (StringUtils.isNotBlank(empDimissionlog.getDeptName())) {
//            queryWrapper.like(EmpDimissionLog::getDeptName, empDimissionlog.getDeptName());
//        }

        if (StringUtils.isNotBlank(empDimissionlog.getEntryDateStr())) {
           queryWrapper.between(EmpDimissionLog::getEntryDate, empDimissionlog.getEntryDateStr().split(",")[0],  empDimissionlog.getEntryDateStr().split(",")[1]);
        }
@@ -65,8 +54,9 @@
        if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
            queryWrapper.eq(EmpDimissionLog::getDimissionType, empDimissionlog.getDimissionType());
        }
        Page<EmpDimissionLog> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());

        return this.baseMapper.selectPageVo(page,queryWrapper);
    }

    @Override
@@ -121,4 +111,4 @@
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empDimissionlogMapper.logicDeleteByIds(list, operatorId);
    }
}
}