Merge branch 'lybfix20210302'

luoyb

2021-03-02 f961867e0e1ca3251928b1134eb66549a6a89ee3

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

@@ -68,16 +68,16 @@
            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());
        }
        if (StrUtil.isNotBlank(vo.getEmpName())) {
            queryWrapper.like("a.empName", vo.getEmpName());
            queryWrapper.like("a.empName", vo.getEmpName().split(","));
        }
        if (StrUtil.isNotBlank(vo.getEmpNumb())) {
            queryWrapper.like("a.empNumb", vo.getEmpNumb());
            queryWrapper.like("a.empNumb", vo.getEmpNumb().split(","));
        }
        if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
            queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
            queryWrapper.like("a.certificateNumb", vo.getCertificateNumb().split(","));
        }
        if (StrUtil.isNotBlank(vo.getDeptName())) {
            queryWrapper.like("a.deptName", 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]);
@@ -85,40 +85,50 @@
        if (StrUtil.isNotBlank(vo.getAge())) {
            String[] arr = vo.getAge().split(",");
            for (String s : arr) {
                if (StrUtil.equals(s, "1")) {
                    queryWrapper.between("a.age", 18, 29);
                }  if (StrUtil.equals(s, "2")) {
                    queryWrapper.between("a.age", 30, 39);
                }  if (StrUtil.equals(s, "3")) {
                    queryWrapper.between("a.age", 40, 49);
                }  if (StrUtil.equals(s, "4")) {
                    queryWrapper.between("a.age", 50, 59);
                }  if (StrUtil.equals(s, "5")) {
                    queryWrapper.between("a.age", 60, 69);
                }  if (StrUtil.equals(s, "6")) {
                    queryWrapper.ge("a.age", 69);
                if (StrUtil.equals(s, "18-29")) {
                    queryWrapper.or().between("a.age", 18, 29);
                }
                if (StrUtil.equals(s, "30-39")) {
                    queryWrapper.or().between("a.age", 30, 39);
                }
                if (StrUtil.equals(s, "40-49")) {
                    queryWrapper.or().between("a.age", 40, 49);
                }
                if (StrUtil.equals(s, "50-59")) {
                    queryWrapper.or().between("a.age", 50, 59);
                }
                if (StrUtil.equals(s, "60-69")) {
                    queryWrapper.or().between("a.age", 60, 69);
                }
                if (StrUtil.equals(s, "69-999")) {
                    queryWrapper.or().ge("a.age", 69);
                }
            }

        }
        if (StrUtil.isNotBlank(vo.getArchivesStatus())) {
                queryWrapper.in("a.archivesStatus", vo.getArchivesStatus());
                queryWrapper.in("a.archivesStatus", vo.getArchivesStatus().split(","));
        }
        if (StrUtil.isNotBlank(vo.getEducation())) {
                queryWrapper.in("a.education", vo.getEducation());
                queryWrapper.in("a.education", vo.getEducation().split(","));
        }
        if (StrUtil.isNotBlank(vo.getSex())) {
                queryWrapper.in("a.sex", vo.getSex());
                queryWrapper.in("a.sex", vo.getSex().split(","));
        }
        if (StrUtil.isNotBlank(vo.getInsuranceType())) {
                queryWrapper.in("a.insuranceType", vo.getInsuranceType());
                queryWrapper.in("a.insuranceType", vo.getInsuranceType().split(","));
        }
        if (StrUtil.isNotBlank(vo.getPolitics())) {
                queryWrapper.in("a.politics", vo.getPolitics());
                queryWrapper.in("a.politics", vo.getPolitics().split(","));
        }
        if (StrUtil.isNotBlank(vo.getEmpStatus())) {
            queryWrapper.in("a.empStatus", vo.getEmpStatus());
            queryWrapper.in("a.empStatus", vo.getEmpStatus().split(","));
        }
        if (StrUtil.isNotBlank(vo.getPolitics())) {
            queryWrapper.in("a.politics", vo.getPolitics().split(","));
        }
        queryWrapper.eq("a.delFlag", 0);
        queryWrapper.orderByAsc("a.deptName,a.empName,a.certificateNumb");
        Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
        String querySql = empAccessoryMapper.getQuerySql();
        IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
@@ -210,7 +220,6 @@
    @Override
    public void mvFiles(String accessoryids,Long labelid,Long empId) {
        String[] arr = accessoryids.split(",");

        LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
        wapper.in(EmpAccessory::getAccessoryid, arr);
        wapper.set(EmpAccessory::getModifier,operatorId);