xx

孔祥富

2021-03-13 9ebcf87b1c398633a07d7eeca760d9d801f95de2

xx

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

@@ -225,6 +225,7 @@
                        .map(DicItem::getDicItemName)
                        .orElse(""));
            }
            EmpBaseInfo empBaseInfo = empBaseInfoList.get(0);
            //工作经历
            String[] workhead = { "开始时间", "结束时间", "工作单位", "主要工作内容"};
            EmpWorkExperience empWorkExperiences=new EmpWorkExperience();
@@ -245,7 +246,7 @@
            String[] empContractInfo = {  "合同签订日期", "合同结束日期", "合同期限(年)", "合同状态", "合同办理人","备注"};
            EmpContractInfo empContractInfo1=new EmpContractInfo();
            empContractInfo1.setCertificateNumb(empNum);
			
            empContractInfo1.setEmpStatus(empBaseInfo.getEmpStatus());
            List<EmpContractInfo> empContractInfos = iEmpContractInfoService.findEmpContractinfos(queryRequest, empContractInfo1).getRecords();
            for (EmpContractInfo empCon:empContractInfos){
                empCon.setContractStatusName(contractstatus.get(empCon.getContractStatus()==null?"":empCon.getContractStatus()));
@@ -254,7 +255,7 @@
            String[] empJobChange = {  "现部门", "现岗位", "姓名", "原部门", "原岗位", "调岗日期", "调岗类型", "调岗理由"};
            EmpJobChange empJobChange1=new EmpJobChange();
            empJobChange1.setCertificateNumb(empNum);
			
            empJobChange1.setEmpStatus(empBaseInfo.getEmpStatus());
            List<Map<String, Object>> empJobChangeList = iEmpJobChangeService.findEmpJobChanges(queryRequest, empJobChange1).getRecords();
            for (Map<String, Object> map:empJobChangeList){
                map.put("changeType",changeType.get(map.get("changeType")==null?"":map.get("changeType").toString()));
@@ -272,7 +273,7 @@
            String[] resign = {  "辞职申请日期", "辞职事由", "汇报人", "备注"};
            EmpResign empResign=new EmpResign();
            empResign.setCertificateNumb(empNum);
			
            empResign.setEmpStatus(empBaseInfo.getEmpStatus());
            List<EmpResign> empResigns = iEmpResignService.findEmpResigns(queryRequest, empResign).getRecords();
            //离职当月考勤
            String[] dimissionAttend = {  "离职考勤月份", "出勤天数", "加班（天）", "加班（小时）", "有无代扣款项", "请假（天）", "旷工（天）", "备注"};
@@ -284,7 +285,7 @@
            String[] dimissionLog = {  "入职日期", "离职日期", "离职类型", "自离天数", "报备人", "备注"};
            EmpDimissionLog empDimissionLog=new EmpDimissionLog();
            empDimissionLog.setCertificateNumb(empNum);
			
            empDimissionLog.setEmpStatus(empBaseInfo.getEmpStatus());
            List<Map<String, Object>> records1 = iEmpDimissionLogService.findEmpDimissionLogs(queryRequest, empDimissionLog).getRecords();
            for (Map<String, Object> objectMap:records1){
                objectMap.put("dimissionType",lztype.get(objectMap.get("dimissionType")==null?"":objectMap.get("dimissionType").toString()));
@@ -293,7 +294,7 @@
            String[] unemployment = {  "失业金申请日期", "申报事由", "汇报人", "审核人", "备注"};
            EmpUnemployment empUnemployment=new EmpUnemployment();
            empUnemployment.setCertificateNumb(empNum);
			
            empUnemployment.setEmpStatus(empBaseInfo.getEmpStatus());
            List<EmpUnemployment> empUnemployments = iEmpUnemploymentService.findEmpUnemployments(queryRequest, empUnemployment).getRecords();
           //社保申请
            String[] insurance = {  "社保申请日期", "申请人", "社保档位", "是否已报告", "状态", "审核人", "备注"};
@@ -340,13 +341,13 @@
            String[] badRecord = {  "不良记录日期", "不良记录描述", "汇报人", "备注"};
            EmpBadRecord empBadRecord=new EmpBadRecord();
            empBadRecord.setCertificateNumb(empNum);
			
            empBadRecord.setEmpStatus(empBaseInfo.getEmpStatus());
            List<EmpBadRecord> empBadRecords = iEmpBadRecordService.findEmpBadrecords(queryRequest, empBadRecord).getRecords();
            //备注
            String[] remarkInfo = {  "备注日期", "备注信息"};
            EmpRemarkInfo empRemarkInfo=new EmpRemarkInfo();
            empRemarkInfo.setCertificateNumb(empNum);
			
            empRemarkInfo.setEmpStatus(empBaseInfo.getEmpStatus());
            List<EmpRemarkInfo> empRemarkInfos = iEmpRemarkinfoService.findEmpRemarkinfos(queryRequest, empRemarkInfo).getRecords();
            String filePath = new CreatePdf().generatePDFs(baseinfo,empBaseInfoList,workhead, empWorkExperiences1,empPhysicalhead,records,
                    empContractInfo,empContractInfos,

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

@@ -337,20 +337,20 @@
        EmpBaseInfo empBaseInfo = empBaseInfoList.get(0);
        float[] ls={3.0f,3.0f,3.0f,3.0f};
        PdfPTable workheadtable = createTable(ls);
        PdfPTable empPhysicalheadtable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
        PdfPTable empContractInfotable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
        PdfPTable empJobChangetable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
        PdfPTable leaveInfotable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
        PdfPTable resigntable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f});
        PdfPTable dimissionAttendtable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
        PdfPTable dimissionLogtable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
        PdfPTable unemploymenttable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f,3.0f});
        PdfPTable insurancetable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
        PdfPTable empPhysicalheadtable = createTable(empPhysicalheadlength);
        PdfPTable empContractInfotable = createTable(empContractInfolength);
        PdfPTable empJobChangetable = createTable(empJobChangelength);
        PdfPTable leaveInfotable = createTable(leaveInfolength);
        PdfPTable resigntable = createTable(resignlength);
        PdfPTable dimissionAttendtable = createTable(dimissionAttendlength);
        PdfPTable dimissionLogtable = createTable(dimissionLoglength);
        PdfPTable unemploymenttable = createTable(unemploymentlength);
        PdfPTable insurancetable = createTable(insurancelength);
        PdfPTable accidentCasestable = createTable(accidentCaseslength);
        PdfPTable occtable = createTable(occupationallength);
        PdfPTable laborTroubletable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
        PdfPTable badRecordtable = createTable(new float[]{3.0f,3.0f,3.0f,3.0f});
        PdfPTable remarkInfotable = createTable(new float[]{3.0f,3.0f});
        PdfPTable laborTroubletable = createTable(laborTroublelength);
        PdfPTable badRecordtable = createTable(badRecordlength);
        PdfPTable remarkInfotable = createTable(remarkInfolength);
        Object[][] basicDatas = {
                {"编号",empBaseInfo.getEmpNumb(),
                        "姓名",empBaseInfo.getEmpName(),
@@ -570,6 +570,7 @@
                empContractInfotable.addCell(createCell(user.getContractPeriod()==null?"":String.valueOf(user.getContractPeriod()), textfont));
                empContractInfotable.addCell(createCell(user.getContractStatusName()==null?"":user.getContractStatusName(), textfont));
                empContractInfotable.addCell(createCell(user.getTransactor()==null?"":user.getTransactor() , textfont));
                empContractInfotable.addCell(createCell(user.getRemark()==null?"":user.getRemark() , textfont));
            }
        }
        int re3=1;