修复导入空行的问题

yijiusmile

2021-04-20 096f6025e0212b23df8485b56818c3f0b019aa26

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

@@ -70,7 +70,7 @@
        if (StrUtil.isNotBlank(vo.getBasic())) {
            queryWrapper.and(p -> {
                p.like("a.empNumb", vo.getBasic())
                        .or().like("a.deptName", vo.getBasic())
                        .or().like("a.allDeptName", vo.getBasic())
                        .or().like("a.certificateNumb", vo.getBasic())
                        .or().like("a.empName", vo.getBasic())
                        .or().like("a.jobName", vo.getBasic());
@@ -86,7 +86,7 @@
            queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
        }
        if (StrUtil.isNotBlank(vo.getDeptName())) {
            queryWrapper.like("a.deptName", vo.getDeptName());
            queryWrapper.like("a.allDeptName", vo.getDeptName());
        }

        if (StrUtil.isNotBlank(vo.getEntryDate())) {
@@ -218,13 +218,13 @@
    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());
        Dict dict = MyUtil.filesUpload(file, properties.getUploadSinglePath() + nameAndCertificateNumb);
        EmpAccessory accessory = new EmpAccessory();
        accessory.setCreatetime(new Date());
        accessory.setCreator(FebsUtil.getUserId());
        accessory.setDelFlag(0);
        accessory.setEmpid(empId);
        accessory.setFilesaddress(dict.getStr("newName"));
        accessory.setFilesaddress(dict.getStr("fileName"));
        accessory.setFilesformat(StrUtil.isBlank(dict.getStr("suffix")) ? dict.getStr("suffix") : dict.getStr("suffix").substring(1));
        accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
        accessory.setFilesname(dict.getStr("fileName"));
@@ -238,12 +238,25 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpAccessory(EmpAccessory empAccessory) throws FebsException {
        if ( empAccessory.getFilesname().indexOf(".")<=0){
        if ( empAccessory.getFilesname().lastIndexOf(".")<=0){
            throw  new FebsException("文件名格式错误");
        }

        EmpAccessory accessory = this.getById(empAccessory.getAccessoryid());

        EmpBaseInfo empBaseInfo = empBaseInfoService.getById(accessory.getEmpid());
        String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
        if (FileUtil.exist(properties.getUploadSinglePath() + nameAndCertificateNumb+empAccessory.getFilesname())){
            throw  new FebsException("文件已经存在");
        }

        File file = new File(properties.getUploadSinglePath() + nameAndCertificateNumb+accessory.getFilesaddress());
        FileUtil.rename(file,empAccessory.getFilesname(),true);
        LambdaUpdateWrapper<EmpAccessory> wrapper = new LambdaUpdateWrapper<>();
        wrapper.eq(EmpAccessory::getAccessoryid,empAccessory.getAccessoryid())
                .set(EmpAccessory::getFilesname,empAccessory.getFilesname()).set(EmpAccessory::getFilesformat,  empAccessory.getFilesname().substring( empAccessory.getFilesname().indexOf(".")+1));
                .set(EmpAccessory::getFilesname,empAccessory.getFilesname())
                .set(EmpAccessory::getFilesaddress,empAccessory.getFilesname())
                .set(EmpAccessory::getFilesformat,  empAccessory.getFilesname().substring( empAccessory.getFilesname().lastIndexOf(".")+1));
        this.update(wrapper);
    }

@@ -282,7 +295,7 @@
            if (fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() == 0) {
                fileName.add(accessory.getFilesname());
            } else {
                fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().indexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
                fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().lastIndexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
            }
        });
        MyUtil.download(request, response, files, fileName);
@@ -387,8 +400,8 @@
                accessory.setDelFlag(0);
                accessory.setEmpid(empBaseInfo.get(0).getEmpId());
                accessory.setFilesaddress(file1.getName());
                if (file1.getName().indexOf(".") > 0) {
                    accessory.setFilesformat( file1.getName().substring(file1.getName().indexOf(".")+1));
                if (file1.getName().lastIndexOf(".") > 0) {
                    accessory.setFilesformat( file1.getName().substring(file1.getName().lastIndexOf(".")+1));
                }
                accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
                accessory.setFilesname(file1.getName());