Merge remote-tracking branch 'origin/master'

Alan

2021-02-21 67aafeb142cf9af2a5dbcd1d17a450f31e2751b3

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

@@ -2,6 +2,7 @@

import java.util.*;

import cc.mrbird.febs.common.core.entity.system.SysConfig;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
@@ -106,6 +107,98 @@
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
            queryWrapper.eq(EmpBaseInfo::getEmpCardStatus, empBaseInfo.getEmpCardStatus());
        }
        Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<EmpBaseInfo> iPage = this.page(page, queryWrapper);
        //设置部门
        List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.forEach(p -> {
            p.setSexName("1".equals(p.getSex()) ? "男" : "女");
            p.setEmpTypeName("1".equals(p.getEmpType()) ? "正式工" : "临时工");
            p.setInsuranceTypeName("1".equals(p.getInsuranceType()) ? "（深户）五险一档" : "（非深户）五险一档");
            p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交");
            // 设置民族
            p.setNationName(dicItems.stream()
                    .filter(k -> DicCode.NATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNation()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("汉族"));
            // 设置政治面貌
            p.setPoliticsName(dicItems.stream()
                    .filter(k -> DicCode.PLITICAL.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPolitics()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("群众"));
            // 设置婚姻状况
            p.setMarriageName(dicItems.stream()
                    .filter(k -> DicCode.MARRIAGE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getMarriage()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("未婚"));
            // 设置学历
            p.setEducationName(dicItems.stream()
                    .filter(k -> DicCode.EDUCATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEducation()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("无学历"));
            // 设置籍贯
            p.setNativePlaceName(dicItems.stream()
                    .filter(k -> DicCode.NATIVEPLACE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNativePlace()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("未知"));
        });
        iPage.setRecords(list);
        return iPage;
    }
    
    @Override
    public IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
        LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
        if (StringUtils.isNotBlank(empBaseInfo.getEmpNumb())) {
            queryWrapper.like(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEmpName())) {
            queryWrapper.like(EmpBaseInfo::getEmpName, empBaseInfo.getEmpName());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
            queryWrapper.like(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getDeptName())) {
            queryWrapper.like(EmpBaseInfo::getDeptName, empBaseInfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEntryDateStr())) {
           queryWrapper.between(EmpBaseInfo::getEntryDate, empBaseInfo.getEntryDateStr().split(",")[0],  empBaseInfo.getEntryDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empBaseInfo.getDimissionDateStr())) {
           queryWrapper.between(EmpBaseInfo::getDimissionDate, empBaseInfo.getDimissionDateStr().split(",")[0],  empBaseInfo.getDimissionDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empBaseInfo.getSex())) {
            queryWrapper.in(EmpBaseInfo::getSex, empBaseInfo.getSex().split(","));
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEducation())) {
            queryWrapper.in(EmpBaseInfo::getEducation, empBaseInfo.getEducation().split(","));
        }
        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.getArchivesStatus())) {
            queryWrapper.in(EmpBaseInfo::getArchivesStatus, empBaseInfo.getArchivesStatus().split(","));
        }
        if (StringUtils.isNotBlank(empBaseInfo.getInsuranceType())) {
            queryWrapper.in(EmpBaseInfo::getInsuranceType, empBaseInfo.getInsuranceType().split(","));
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEmpStatus())) {
            queryWrapper.in(EmpBaseInfo::getEmpStatus, empBaseInfo.getEmpStatus().split(","));
        }
        Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<EmpBaseInfo> iPage = this.page(page, queryWrapper);
@@ -376,6 +469,13 @@
    public IPage<EmpBaseInfo> baseInfoList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
        Page<EmpBaseInfo> page = new Page<EmpBaseInfo>(new Long(pageNum), new Long(pageSize));
        IPage<EmpBaseInfo> iPage =null;
        List<SysConfig> sysConfig=this.baseMapper.sysConfig();
        String manOld="";
        String womanOld="";
        if(sysConfig.size()>0){
            manOld=sysConfig.get(0).getConfigValue();
            womanOld=sysConfig.get(1).getConfigValue();
        }
        if("1".equals(number)){ //在职员工
            iPage = this.empBaseInfoMapper.zzbaseInfoList(page, index,btime,etime,name);
        }else if("2".equals(number)){ //新进员工
@@ -385,7 +485,7 @@
        }else if("4".equals(number)){ //临时员工
            iPage = this.empBaseInfoMapper.lsbaseInfoList(page, index,btime,etime,name);
        }else if("5".equals(number)){ //超龄员工
            iPage = this.empBaseInfoMapper.baseInfoList(page, index,btime,etime,name);
            iPage = this.empBaseInfoMapper.clbaseInfoList(page, index,btime,etime,name,manOld,womanOld);
        }else if("6".equals(number)){ //离职员工总数
            iPage = this.empBaseInfoMapper.lzbaseInfoList(page, index,btime,etime,name);
        }else if("7".equals(number)){ //辞职申请人数
@@ -519,8 +619,12 @@
    }

    @Override
    public IPage<?> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
        return null;
    public IPage<EmpJobChange> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
        Page<EmpJobChange> page = new Page<EmpJobChange>(new Long(pageNum), new Long(pageSize));
        IPage<EmpJobChange> iPage =null;
        //调岗
        iPage = this.empBaseInfoMapper.empBaseInfoTgList(page, index,btime,etime,name,number);
        return iPage;
    }

    @Override
@@ -570,8 +674,15 @@

    @Override
    public Map<String, Object> countBaseInfoList(String index, String btime, String etime) {
        List<SysConfig> sysConfig=this.baseMapper.sysConfig();
        String manOld="";
        String womanOld="";
        if(sysConfig.size()>0){
            manOld=sysConfig.get(0).getConfigValue();
            womanOld=sysConfig.get(1).getConfigValue();
        }
        //在职员工,正式员工，临时员工，正常离职，自动离职，公司辞退        判断条件离职申请日期
        Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index,btime,etime);
        Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index,btime,etime,manOld,womanOld);
        //新进员工      判断条件入职日期
        Integer xjygObjectMap =this.baseMapper.countXjygBaseInfoList(index,btime,etime);
        if(xjygObjectMap!=null){