Merge branch '查询条件修改'

luoyb

2021-03-08 bfeab0c9d94480f4e742d311d168c79572b78745

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

@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.core.utils.MyUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpAccessoryMapper;
import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
import cc.mrbird.febs.server.hr.service.IEmpAccessoryService;
@@ -21,6 +22,7 @@
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.aspectj.weaver.ast.Or;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -30,6 +32,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;

import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
@@ -51,6 +55,7 @@
    private final ILabelService labelService;
    private final EmpAccessoryMapper empAccessoryMapper;
    private final FebsServerHrProperties properties;
    private final IRemoteDeptService remoteDeptService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");
@@ -63,6 +68,16 @@
    @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.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());
        }
@@ -75,53 +90,73 @@
        if (StrUtil.isNotBlank(vo.getDeptName())) {
            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]);
        }
        if (StrUtil.isNotBlank(vo.getAge())) {
            if (StrUtil.equals(vo.getAge(), "1")) {
                queryWrapper.between("a.age", 18, 29);
            } else if (StrUtil.equals(vo.getAge(), "2")) {
                queryWrapper.between("a.age", 30, 39);
            } else if (StrUtil.equals(vo.getAge(), "3")) {
                queryWrapper.between("a.age", 40, 49);
            } else if (StrUtil.equals(vo.getAge(), "4")) {
                queryWrapper.between("a.age", 50, 59);
            } else if (StrUtil.equals(vo.getAge(), "5")) {
                queryWrapper.between("a.age", 60, 69);
            } else if (StrUtil.equals(vo.getAge(), "6")) {
                queryWrapper.ge("a.age", 69);
            String[] arr = vo.getAge().split(",");
            for (String s : arr) {
                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())) {
            if (!StrUtil.equals(vo.getArchivesStatus(), "-1")) {
                queryWrapper.eq("a.archivesStatus", vo.getArchivesStatus());
            }
            queryWrapper.in("a.archivesStatus", vo.getArchivesStatus().split(","));
        }
        if (StrUtil.isNotBlank(vo.getEducation())) {
            if (!StrUtil.equals(vo.getEducation(), "-1")) {
                queryWrapper.eq("a.education", vo.getEducation());
            }
            queryWrapper.in("a.education", vo.getEducation().split(","));
        }
        if (StrUtil.isNotBlank(vo.getSex())) {
            if (!StrUtil.equals(vo.getSex(), "-1")) {
                queryWrapper.eq("a.sex", vo.getSex());
            }
            queryWrapper.in("a.sex", vo.getSex().split(","));
        }
        if (StrUtil.isNotBlank(vo.getInsuranceType())) {
            if (!StrUtil.equals(vo.getInsuranceType(), "-1")) {
                queryWrapper.eq("a.insuranceType", vo.getInsuranceType());
            }
            queryWrapper.in("a.insuranceType", vo.getInsuranceType().split(","));
        }
        if (StrUtil.isNotBlank(vo.getPolitics())) {
            if (!StrUtil.equals(vo.getPolitics(), "-1")) {
                queryWrapper.eq("a.politics", vo.getPolitics());
            }
            queryWrapper.in("a.politics", vo.getPolitics().split(","));
        }
        queryWrapper.eq("a.delFlag", 0);
        if (StrUtil.isNotBlank(vo.getEmpStatus())) {
            queryWrapper.in("a.empStatus", vo.getEmpStatus().split(","));
        }
        if (StrUtil.isNotBlank(vo.getPolitics())) {
            queryWrapper.in("a.politics", vo.getPolitics().split(","));
        }

        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());
        String querySql = empAccessoryMapper.getQuerySql();
        return empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
        IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
        return mapIPage;
    }

    @Override
@@ -174,11 +209,10 @@
        String[] arr = accessoryids.split(",");
        LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
        wapper.in(EmpAccessory::getAccessoryid, arr);
        EmpAccessory accessory = new EmpAccessory();
        accessory.setModifier(operatorId);
        accessory.setModifytime(new Date());
        accessory.setDelFlag(1);
        this.update(accessory, wapper);
        wapper.set(EmpAccessory::getDelFlag, 1);
        wapper.set(EmpAccessory::getModifier, operatorId);
        wapper.set(EmpAccessory::getModifytime, new Date());
        this.update(wapper);

        LambdaQueryWrapper<EmpAccessory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.in(EmpAccessory::getAccessoryid, arr);
@@ -201,7 +235,11 @@
            EmpBaseInfo empBaseInfo = empBaseInfoService.getById(accessory.getEmpid());
            String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
            files.add(new File(properties.getUploadSinglePath() + nameAndCertificateNumb + accessory.getFilesaddress()));
            fileName.add(accessory.getFilesname());
            if (fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() == 0) {
                fileName.add(accessory.getFilesname());
            } else {
                fileName.add(accessory.getFilesname() + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() + 1);
            }
        });
        MyUtil.download(request, response, files, fileName);

@@ -210,15 +248,12 @@
    @Override
    public void mvFiles(String accessoryids, Long labelid, Long empId) {
        String[] arr = accessoryids.split(",");

        LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
        wapper.in(EmpAccessory::getAccessoryid, arr);
        EmpAccessory empAccessory = new EmpAccessory();
        empAccessory.setModifier(operatorId);
        empAccessory.setModifytime(new Date());
        empAccessory.setLabelid(labelid);
        empAccessory.setEmpid(empId);
        this.update(empAccessory, wapper);
        wapper.set(EmpAccessory::getModifier, operatorId);
        wapper.set(EmpAccessory::getModifytime, new Date());
        wapper.set(EmpAccessory::getLabelid, labelid);
        this.update(wapper);

    }

@@ -255,4 +290,13 @@
        FileUtil.del(new StringBuilder().append(mianFileStr, 0, mianFileStr.length() - 1).append(".zip").toString());
        FileUtil.del(mianFileStr);
    }


    @Override
    public Integer getLabelCount(Long labelId) {
        LambdaQueryWrapper<EmpAccessory> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(EmpAccessory::getDelFlag, 0);
        wrapper.eq(EmpAccessory::getLabelid, labelId);
        return this.count(wrapper);
    }
}