年龄查询改成或的关系

yijiusmile

2021-02-26 906f38b1427bd6ee6506723e5d2ae09137dbbe5b

年龄查询改成或的关系

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

@@ -5,6 +5,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.*;
import java.util.function.Consumer;

import cc.mrbird.febs.common.core.entity.system.SysConfig;
import cc.mrbird.febs.common.core.utils.MyUtil;
@@ -194,13 +195,19 @@
        if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
            queryWrapper.in(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics().split(","));
        }
        if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
            String[] ages=empBaseInfo.getAgeStr().split(",");
            for (int i = 0; i < ages.length; i++) {
                String ageBtn=ages[i];
                queryWrapper.between(EmpBaseInfo::getAge, ageBtn.split("-")[0],  ageBtn.split("-")[1]);
            }
        }
        if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
            String[] ages = empBaseInfo.getAgeStr().split(",");
            Consumer<LambdaQueryWrapper<EmpBaseInfo>> consumer = new Consumer<LambdaQueryWrapper<EmpBaseInfo>>() {
                @Override
                public void accept(LambdaQueryWrapper<EmpBaseInfo> wrapper) {
                    for (int i = 0; i < ages.length; i++) {
                        String ageBtn = ages[i];
                        wrapper.or().between(EmpBaseInfo::getAge, ageBtn.split("-")[0], ageBtn.split("-")[1]);
                    }
                }
            };
            queryWrapper.and(consumer);
        }
        if (StringUtils.isNotBlank(empBaseInfo.getArchivesStatus())) {
            queryWrapper.in(EmpBaseInfo::getArchivesStatus, empBaseInfo.getArchivesStatus().split(","));
        }