Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-09 6d05ae432c4d76e521e031a76232a6dd1b0ff105

Merge remote-tracking branch 'origin/master'

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java

@@ -127,4 +127,16 @@
            throw new FebsException(message);
        }
    }


    @PostMapping("autoInstall")
    public void autoInstall(  String fileids) throws FebsException {
        try {
            this.empAccessoryService.autoInstall(fileids);
        } catch (Exception e) {
            String message = "插入文件失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
}

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

@@ -66,4 +66,7 @@


    Integer getLabelCount(Long labelId);


    void autoInstall(String fileids);
}

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

@@ -299,4 +299,52 @@
        wrapper.eq(EmpAccessory::getLabelid, labelId);
        return this.count(wrapper);
    }

    @Override
    public void autoInstall(String fileids) {
        File[] list = FileUtil.ls(fileids);
        for (File file : list) {

            String[] fileName = file.getName().split("_");
            List<EmpBaseInfo> empBaseInfo = empBaseInfoService.list(new LambdaQueryWrapper<EmpBaseInfo>().eq(EmpBaseInfo::getCertificateNumb, fileName[1]).ne(EmpBaseInfo::getDelFlag, 1));
            if (0 == empBaseInfo.size()) {
                continue;
            }
            File[] childlist = FileUtil.ls(fileids+"/"+file.getName());
            for (File file1 : childlist) {
                EmpAccessory accessory = new EmpAccessory();
                if (file1.getName().indexOf("体检")>=0){
                    accessory.setLabelid(142445218121729L);
                }else if (file1.getName().indexOf("合同")>=0){
                    accessory.setLabelid(142445285230593L);
                }else if (file1.getName().indexOf("入职")>=0||file1.getName().indexOf("务工")>=0){
                    accessory.setLabelid(143073554221057L);
                }else if (file1.getName().indexOf("身份")>=0){
                    accessory.setLabelid(143007818991617L);
                }else if (file1.getName().indexOf("银行卡")>=0){
                    accessory.setLabelid(143073768130561L);
                }else if (file1.getName().indexOf("证")>=0){
                    accessory.setLabelid(143073812170753L);
                }else{
                    accessory.setLabelid(142445180372993L);
                }

                accessory.setCreatetime(new Date());
                accessory.setCreator(FebsUtil.getUserId());
                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));
                }
                accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
                accessory.setFilesname(file1.getName());
                accessory.setModifier(FebsUtil.getUserId());
                accessory.setModifytime(new Date());
                accessory.setVersion(0);
                this.save(accessory);
            }

        }
    }
}

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

@@ -17,6 +17,7 @@
import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
import cc.mrbird.febs.server.hr.service.*;
import cc.mrbird.febs.server.hr.util.PoiExportExcel;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cc.mrbird.febs.server.hr.entity.*;
@@ -83,8 +84,8 @@
    private final EmpBadRecordMapper empBadRecordMapper;
    private final EmpRemarkInfoMapper empRemarkInfoMapper;
    private final IRemoteDicItemService remoteDicItemService;
    private final EmpOccupationalMapper empOccupationalMapper;

    // private final String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");

    @Override
    public IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
@@ -981,7 +982,8 @@
            dicItems.stream().forEach(dicItem -> itemMap.put(dicItem.getDicItemCode(), dicItem.getDicItemName()));
            map.put(dicItems.get(0).getDicCode().toLowerCase(), itemMap);
        });

        List<String> sheetNames = new ArrayList<>();
        sheetNames.add("基本信息");
        //基本信息
        QueryRequest request = new QueryRequest();
        request.setPageSize(25535);
@@ -996,95 +998,126 @@

        //工作经历
        IPage<EmpWorkExperience> workExperienceIPage = empWorkExperienceMapper.selectPageVo(page, new QueryWrapper<EmpWorkExperience>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpWorkExperience.class);
        List<Map<String, Object>> allListEmpWork = PoiExportExcel.getDataList(exportField, workExperienceIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpWork.get(0));
        if (workExperienceIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpWorkExperience.class);
            List<Map<String, Object>> allListEmpWork = PoiExportExcel.getDataList(exportField, workExperienceIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpWork.get(0));
            sheetNames.add("工作经历");
        }

        //体检信息
        IPage<EmpPhysicalExam> empPhysicalExamIPage = empPhysicalExamMapper.selectPageVo(page, new QueryWrapper<EmpPhysicalExam>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpWorkExperience.class);
        List<Map<String, Object>> allListEmpPhysical = PoiExportExcel.getDataList(exportField, empPhysicalExamIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpPhysical.get(0));

        if (empPhysicalExamIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpWorkExperience.class);
            List<Map<String, Object>> allListEmpPhysical = PoiExportExcel.getDataList(exportField, empPhysicalExamIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpPhysical.get(0));
            sheetNames.add("体检信息");
        }

        //调岗记录
        IPage<EmpJobChange> jobChangeIPage = empJobChangeMapper.selectPageVoBean(page, new QueryWrapper<EmpJobChange>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpJobChange.class);
        List<Map<String, Object>> allListjobChangeI = PoiExportExcel.getDataList(exportField, jobChangeIPage.getRecords(), listMapDicItem);
        allList.add(allListjobChangeI.get(0));
        if (jobChangeIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpJobChange.class);
            List<Map<String, Object>> allListjobChangeI = PoiExportExcel.getDataList(exportField, jobChangeIPage.getRecords(), listMapDicItem);
            allList.add(allListjobChangeI.get(0));
            sheetNames.add("调岗记录");
        }

        //合同信息
        IPage<EmpContractInfo> empContractInfoIPage = empContractInfoMapper.selectPageVo(page, new QueryWrapper<EmpContractInfo>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpContractInfo.class);
        List<Map<String, Object>> allListEmpContractInfo = PoiExportExcel.getDataList(exportField, empContractInfoIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpContractInfo.get(0));
        if (empContractInfoIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpContractInfo.class);
            List<Map<String, Object>> allListEmpContractInfo = PoiExportExcel.getDataList(exportField, empContractInfoIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpContractInfo.get(0));
            sheetNames.add("合同信息");
        }

        //入离职记录
        IPage<EmpDimissionAttend> empDimissionAttendIPage = empDimissionAttendMapper.selectPageVo(page, new QueryWrapper<EmpDimissionAttend>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpDimissionAttend.class);
        List<Map<String, Object>> allListEmpDimissionAtt = PoiExportExcel.getDataList(exportField, empDimissionAttendIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpDimissionAtt.get(0));
        if (empDimissionAttendIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpDimissionAttend.class);
            List<Map<String, Object>> allListEmpDimissionAtt = PoiExportExcel.getDataList(exportField, empDimissionAttendIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpDimissionAtt.get(0));
            sheetNames.add("入离职记录");
        }

        //请假记录
        IPage<EmpLeaveInfo> empLeaveInfoIPage = empLeaveInfoMapper.selectPageVo(page, new QueryWrapper<EmpLeaveInfo>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpLeaveInfo.class);
        List<Map<String, Object>> allListEmpLoeaveInfo = PoiExportExcel.getDataList(exportField, empLeaveInfoIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpLoeaveInfo.get(0));
        if (empLeaveInfoIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpLeaveInfo.class);
            List<Map<String, Object>> allListEmpLoeaveInfo = PoiExportExcel.getDataList(exportField, empLeaveInfoIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpLoeaveInfo.get(0));
            sheetNames.add("请假记录");
        }


        //失业金领取
        IPage<EmpUnemployment> empUnemploymentIPage = empUnemploymentMapper.selectPageVo(page, new QueryWrapper<EmpUnemployment>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpUnemployment.class);
        List<Map<String, Object>> allListEmpUnemployment = PoiExportExcel.getDataList(exportField, empUnemploymentIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpUnemployment.get(0));

        if (empUnemploymentIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpUnemployment.class);
            List<Map<String, Object>> allListEmpUnemployment = PoiExportExcel.getDataList(exportField, empUnemploymentIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpUnemployment.get(0));
            sheetNames.add("失业金领取");
        }

        //社保申请
        IPage<EmpInsurance> empInsuranceIPage = empInsuranceMapper.selectPageVo(page, new QueryWrapper<EmpInsurance>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpInsurance.class);
        List<Map<String, Object>> allListEmpInsurance = PoiExportExcel.getDataList(exportField, empInsuranceIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpInsurance.get(0));
        if (empInsuranceIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpInsurance.class);
            List<Map<String, Object>> allListEmpInsurance = PoiExportExcel.getDataList(exportField, empInsuranceIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpInsurance.get(0));
            sheetNames.add("社保申请");
        }


        //意外险案件
        IPage<EmpAccidentCases> empAccidentCasesIPage = empAccidentCasesMapper.selectPageVo(page, new QueryWrapper<EmpInsurance>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpAccidentCases.class);
        List<Map<String, Object>> allListEmpAccidentCases = PoiExportExcel.getDataList(exportField, empAccidentCasesIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpAccidentCases.get(0));
        if (empAccidentCasesIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpAccidentCases.class);
            List<Map<String, Object>> allListEmpAccidentCases = PoiExportExcel.getDataList(exportField, empAccidentCasesIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpAccidentCases.get(0));
            sheetNames.add("意外险案件");
        }

        //工伤案件
        IPage<EmpOccupational> empOccupationalIPage = empOccupationalMapper.selectPageVo(page, new QueryWrapper<EmpOccupational>().in("a.empId", empIds).ne("a.delFlag", 1));
        if (empOccupationalIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpOccupational.class);
            List<Map<String, Object>> allListEmpOccupational = PoiExportExcel.getDataList(exportField, empOccupationalIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpOccupational.get(0));
            sheetNames.add("工伤案件");
        }

        //劳资案件
        IPage<EmpLaborTrouble> empLaborTroubleIPage = empLaborTroubleMapper.selectPageVo(page, new QueryWrapper<EmpInsurance>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpLaborTrouble.class);
        List<Map<String, Object>> allListEmpLaborTrouble = PoiExportExcel.getDataList(exportField, empLaborTroubleIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpLaborTrouble.get(0));
        if (empLaborTroubleIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpLaborTrouble.class);
            List<Map<String, Object>> allListEmpLaborTrouble = PoiExportExcel.getDataList(exportField, empLaborTroubleIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpLaborTrouble.get(0));
            sheetNames.add("劳资案件");
        }


        //不良记录
        IPage<EmpBadRecord> empBadRecordIPage = empBadRecordMapper.selectPageVo(page, new QueryWrapper<EmpInsurance>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpBadRecord.class);
        List<Map<String, Object>> allListEmpBadRecord = PoiExportExcel.getDataList(exportField, empBadRecordIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpBadRecord.get(0));
        if (empBadRecordIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpBadRecord.class);
            List<Map<String, Object>> allListEmpBadRecord = PoiExportExcel.getDataList(exportField, empBadRecordIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpBadRecord.get(0));
            sheetNames.add("不良记录");
        }


        //备注信息
        IPage<EmpRemarkInfo> empRemarkInfoIPage = empRemarkInfoMapper.selectPageVo(page, new QueryWrapper<EmpRemarkInfo>().in("a.empId", empIds).ne("a.delFlag", 1));
        exportField = FebsUtil.reflectAnnotation(EmpRemarkInfo.class);
        List<Map<String, Object>> allListEmpRemarkInfo = PoiExportExcel.getDataList(exportField, empRemarkInfoIPage.getRecords(), listMapDicItem);
        allList.add(allListEmpRemarkInfo.get(0));
        if (empRemarkInfoIPage.getRecords().size()!=0){
            exportField = FebsUtil.reflectAnnotation(EmpRemarkInfo.class);
            List<Map<String, Object>> allListEmpRemarkInfo = PoiExportExcel.getDataList(exportField, empRemarkInfoIPage.getRecords(), listMapDicItem);
            allList.add(allListEmpRemarkInfo.get(0));
            sheetNames.add("备注信息");
        }


        List<String> sheetNames = new ArrayList<>();
        sheetNames.add("基本信息");
        sheetNames.add("工作经历");
        sheetNames.add("体检信息");
        sheetNames.add("调岗记录");
        sheetNames.add("合同信息");
        sheetNames.add("入离职记录");
        sheetNames.add("请假记录");
        sheetNames.add("失业金领取");
        sheetNames.add("社保申请");
        sheetNames.add("意外险案件");
        sheetNames.add("工商案件");
        sheetNames.add("劳资案件");
        sheetNames.add("不良记录");
        sheetNames.add("备注信息");
        boolean result = PoiExportExcel.exportCommonExcelMultiSheet(response, "在职员工列表", allList, sheetNames);
    }
}

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

@@ -9,10 +9,12 @@
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.MyUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.FilesUpload;
import cc.mrbird.febs.server.hr.entity.Folder;
import cc.mrbird.febs.server.hr.mapper.FilesUploadMapper;
import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IFilesUploadService;
import cc.mrbird.febs.server.hr.service.IFolderService;
import cn.hutool.core.io.FileUtil;
@@ -48,6 +50,7 @@

    private final IFolderService iFolderService;
    private final FebsServerHrProperties properties;
    private final IEmpBaseInfoService empBaseInfoService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");
@@ -109,9 +112,9 @@
        String[] arr = fileids.split(",");
        LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>();
        wapper.in(FilesUpload::getFilesid, arr);
        wapper.set(FilesUpload::getDelFlag,1);
        wapper.set(FilesUpload::getModifier,operatorId);
        wapper.set(FilesUpload::getModifytime,new Date());
        wapper.set(FilesUpload::getDelFlag, 1);
        wapper.set(FilesUpload::getModifier, operatorId);
        wapper.set(FilesUpload::getModifytime, new Date());
        this.update(wapper);

        LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>();
@@ -134,10 +137,10 @@
            FilesUpload filesUpload = this.getById(i);
            Folder folder = iFolderService.getById(filesUpload.getFolderid());
            files.add(new File(properties.getUploadCommonPath() + folder.getFoldername() + "/" + filesUpload.getFilesaddress()));
            if ( fileName.parallelStream().filter(filter->StrUtil.equals(filesUpload.getFilesname(),filter)).count()==0){
            if (fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count() == 0) {
                fileName.add(filesUpload.getFilesname());
            }else{
                fileName.add(filesUpload.getFilesname()+fileName.parallelStream().filter(filter->StrUtil.equals(filesUpload.getFilesname(),filter)).count()+1);
            } else {
                fileName.add(filesUpload.getFilesname() + fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count() + 1);
            }

        });
@@ -146,7 +149,7 @@
    }

    @Override
    public void mvFiles(String fileids,Long folderid) {
    public void mvFiles(String fileids, Long folderid) {
        String[] arr = fileids.split(",");

        LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>();
@@ -157,17 +160,19 @@
            Folder newfolder = iFolderService.getById(folderid);
            File oldfile = new File(properties.getUploadCommonPath() + folder.getFoldername() + "/" + i.getFilesaddress());
            File newfile = new File(properties.getUploadCommonPath() + newfolder.getFoldername() + "/" + i.getFilesaddress());
            FileUtil.move(oldfile,newfile,true);
            FileUtil.move(oldfile, newfile, true);
        });

        LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>();
        wapper.in(FilesUpload::getFilesid, arr);
        wapper.set(FilesUpload::getFolderid,fileids);
        wapper.set(FilesUpload::getModifier,operatorId);
        wapper.set(FilesUpload::getModifytime,new Date());
        wapper.set(FilesUpload::getFolderid, fileids);
        wapper.set(FilesUpload::getModifier, operatorId);
        wapper.set(FilesUpload::getModifytime, new Date());
        this.update(wapper);

    }




}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java

@@ -1454,7 +1454,7 @@
                            }

                            if (null != listMapDicItem) {

                                for (int ss = 0; ss < listMapDicItem.size(); ss++) {

                                    //因为数据字典查出来之后改成了全小写，这里也改成全小些

                                    //因为数据字典查出来之后改成了全小写，这里也改成全小写

                                    if (null != listMapDicItem.get(ss).get(s[j].toLowerCase())) {

                                        Map<String, String> mapDicItem = (Map<String, String>) listMapDicItem.get(ss).get(s[j].toLowerCase());

                                        value = mapDicItem.get(value);

@@ -1654,7 +1654,7 @@
                System.out.println(e.getMessage());

                return false;

            } catch (Exception e) {

                System.out.println(e.getMessage());

                e.printStackTrace();

                return false;

            } finally {

                if (null != fileOutputStream) {