Merge remote-tracking branch 'origin/master'

孔祥富

2021-02-24 75b7365399fd87efb8691c909aedb5503b03ccc8

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

@@ -61,73 +61,67 @@
    private Snowflake snowflake = IdUtil.getSnowflake(ModuleCode.HR_FIlE, 1);

    @Override
    public IPage<Map<String,Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
    public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
        QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
        if (StrUtil.isNotBlank(vo.getEmpName())){
            queryWrapper.like("a.empName",vo.getEmpName());
        if (StrUtil.isNotBlank(vo.getEmpName())) {
            queryWrapper.like("a.empName", vo.getEmpName());
        }
        if (StrUtil.isNotBlank(vo.getEmpNumb())){
            queryWrapper.like("a.empNumb",vo.getEmpNumb());
        if (StrUtil.isNotBlank(vo.getEmpNumb())) {
            queryWrapper.like("a.empNumb", vo.getEmpNumb());
        }
        if (StrUtil.isNotBlank(vo.getCertificateNumb())){
            queryWrapper.like("a.certificateNumb",vo.getCertificateNumb());
        if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
            queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
        }
        if (StrUtil.isNotBlank(vo.getDeptName())){
            queryWrapper.like("a.deptName",vo.getDeptName());
        if (StrUtil.isNotBlank(vo.getDeptName())) {
            queryWrapper.like("a.deptName", vo.getDeptName());
        }
        if (StrUtil.isNotBlank(vo.getEntryDate())){
            queryWrapper.between("a.entryDate",vo.getEntryDate().split(",")[0],vo.getEntryDate().split(",")[1]);
        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);
        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.isNotBlank(vo.getArchivesStatus())){
            if(!StrUtil.equals(vo.getArchivesStatus(),"-1")) {
                queryWrapper.eq("a.archivesStatus", vo.getArchivesStatus());
            }
        if (StrUtil.isNotBlank(vo.getArchivesStatus())) {
                queryWrapper.in("a.archivesStatus", vo.getArchivesStatus());
        }
        if(StrUtil.isNotBlank(vo.getEducation())){
            if(!StrUtil.equals(vo.getEducation(),"-1")) {
                queryWrapper.eq("a.education", vo.getEducation());
            }
        if (StrUtil.isNotBlank(vo.getEducation())) {
                queryWrapper.in("a.education", vo.getEducation());
        }
        if(StrUtil.isNotBlank(vo.getSex())){
            if(!StrUtil.equals(vo.getSex(),"-1")) {
                queryWrapper.eq("a.sex", vo.getSex());
            }
        if (StrUtil.isNotBlank(vo.getSex())) {
                queryWrapper.in("a.sex", vo.getSex());
        }
        if(StrUtil.isNotBlank(vo.getInsuranceType())){
            if(!StrUtil.equals(vo.getInsuranceType(),"-1")) {
                queryWrapper.eq("a.insuranceType", vo.getInsuranceType());
            }
        if (StrUtil.isNotBlank(vo.getInsuranceType())) {
                queryWrapper.in("a.insuranceType", vo.getInsuranceType());
        }
        if(StrUtil.isNotBlank(vo.getPolitics())){
            if(!StrUtil.equals(vo.getPolitics(),"-1")) {
                queryWrapper.eq("a.politics", vo.getPolitics());
            }
        if (StrUtil.isNotBlank(vo.getPolitics())) {
                queryWrapper.in("a.politics", vo.getPolitics());
        }
        queryWrapper.eq("a.delFlag",0);
        queryWrapper.eq("a.delFlag", 0);
        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
    public List<EmpAccessory> findEmpAccessorys(EmpAccessory empAccessory) {
        LambdaQueryWrapper<EmpAccessory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpAccessory::getDelFlag,0);
        queryWrapper.eq(EmpAccessory::getDelFlag, 0);
        if (null != empAccessory.getLabelid()) {
            queryWrapper.eq(EmpAccessory::getLabelid, empAccessory.getLabelid());
        }
@@ -142,10 +136,10 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpAccessory(Long labelid, MultipartFile file,Long empId) throws FebsException, IOException {
    public void createEmpAccessory(Long labelid, MultipartFile file, Long empId) throws FebsException, IOException {
        EmpBaseInfo empBaseInfo = empBaseInfoService.getById(empId);
        String nameAndCertificateNumb = empBaseInfo.getEmpName()+"_"+empBaseInfo.getCertificateNumb()+"/";
        Dict dict = MyUtil.filesUpload(file,properties.getUploadSinglePath()+nameAndCertificateNumb,snowflake.nextIdStr());
        String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
        Dict dict = MyUtil.filesUpload(file, properties.getUploadSinglePath() + nameAndCertificateNumb, snowflake.nextIdStr());
        EmpAccessory accessory = new EmpAccessory();
        accessory.setCreatetime(new Date());
        accessory.setCreator(operatorId);
@@ -174,11 +168,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);
@@ -213,12 +206,10 @@

        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 +246,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);
    }
}