From 4e48571d3217113f441567b9417d81b3933b0684 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 09:37:16 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java | 30 +++++++-------
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java | 41 ++++++--------------
2 files changed, 28 insertions(+), 43 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
index 922e798..b0ba009 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
@@ -226,14 +226,14 @@
.orElse(""));
}
//工作经历
- String[] workhead = { "序号","开始时间", "结束时间", "工作单位", "主要工作内容"};
+ String[] workhead = { "开始时间", "结束时间", "工作单位", "主要工作内容"};
EmpWorkExperience empWorkExperiences=new EmpWorkExperience();
empWorkExperiences.setCertificateNumb(empNum);
empWorkExperiences.setDelFlag(0);
List<EmpWorkExperience> empWorkExperiences1 = iEmpWorkExperienceService.findEmpWorkExperiences(queryRequest, empWorkExperiences).getRecords();
//体检信息
- String[] empPhysicalhead = { "序号","体检医院", "体检日期", "体检类型", "血压", "转氨酶", "心电图", "体检结论", "复查日期", "备注"};
+ String[] empPhysicalhead = { "体检医院", "体检日期", "体检类型", "血压", "转氨酶", "心电图", "体检结论", "复查日期", "备注"};
EmpPhysicalExam empPhysicalExam=new EmpPhysicalExam();
empPhysicalExam.setCertificateNumb(empNum);
@@ -242,7 +242,7 @@
empPhysicalExam1.setPhysicalExamTypeName(physicalExamType.get(empPhysicalExam1.getPhysicalExamType()==null?"":empPhysicalExam1.getPhysicalExamType()));
}
//合同信息
- String[] empContractInfo = { "序号","合同签订日期", "合同结束日期", "合同期限(年)", "合同状态", "合同办理人","备注"};
+ String[] empContractInfo = { "合同签订日期", "合同结束日期", "合同期限(年)", "合同状态", "合同办理人","备注"};
EmpContractInfo empContractInfo1=new EmpContractInfo();
empContractInfo1.setCertificateNumb(empNum);
@@ -251,7 +251,7 @@
empCon.setContractStatusName(contractstatus.get(empCon.getContractStatus()==null?"":empCon.getContractStatus()));
}
//调岗记录
- String[] empJobChange = { "序号","现部门", "现岗位", "姓名", "原部门", "原岗位", "调岗日期", "调岗类型"};
+ String[] empJobChange = { "现部门", "现岗位", "姓名", "原部门", "原岗位", "调岗日期", "调岗类型"};
EmpJobChange empJobChange1=new EmpJobChange();
empJobChange1.setCertificateNumb(empNum);
@@ -260,7 +260,7 @@
map.put("changeType",changeType.get(map.get("changeType")==null?"":map.get("changeType").toString()));
}
//请假记录
- String[] leaveInfo = { "序号","开始时间", "结束时间", "请假天数", "请假类型", "到岗时间", "报备人", "备注"};
+ String[] leaveInfo = { "开始时间", "结束时间", "请假天数", "请假类型", "到岗时间", "报备人", "备注"};
EmpLeaveInfo empLeaveInfo=new EmpLeaveInfo();
empLeaveInfo.setCertificateNumb(empNum);
@@ -269,19 +269,19 @@
leaveInfo1.setLeaveTypeName(leavetype.get(leaveInfo1.getLeaveType()==null?"":leaveInfo1.getLeaveType()));
}
//辞职申请
- String[] resign = { "序号","辞职申请日期", "辞职事由", "汇报人", "备注"};
+ String[] resign = { "辞职申请日期", "辞职事由", "汇报人", "备注"};
EmpResign empResign=new EmpResign();
empResign.setCertificateNumb(empNum);
List<EmpResign> empResigns = iEmpResignService.findEmpResigns(queryRequest, empResign).getRecords();
//离职当月考勤
- String[] dimissionAttend = { "序号","离职考勤月份", "出勤天数", "加班（天）", "加班（小时）", "有无代扣款项", "请假（天）", "旷工（天）", "备注"};
+ String[] dimissionAttend = { "离职考勤月份", "出勤天数", "加班（天）", "加班（小时）", "有无代扣款项", "请假（天）", "旷工（天）", "备注"};
EmpDimissionAttend empDimissionAttend=new EmpDimissionAttend();
empDimissionAttend.setCertificateNumb(empNum);
List<EmpDimissionAttend> dimissionAttends = iEmpDimissionAttendService.findEmpDimissionattends(queryRequest, empDimissionAttend).getRecords();
//入离职记录
- String[] dimissionLog = { "序号","入职日期", "离职日期", "离职类型", "自离天数", "报备人", "备注"};
+ String[] dimissionLog = { "入职日期", "离职日期", "离职类型", "自离天数", "报备人", "备注"};
EmpDimissionLog empDimissionLog=new EmpDimissionLog();
empDimissionLog.setCertificateNumb(empNum);
@@ -290,13 +290,13 @@
objectMap.put("dimissionType",lztype.get(objectMap.get("dimissionType")==null?"":objectMap.get("dimissionType").toString()));
}
//失业金领取
- String[] unemployment = { "序号","失业金申请日期", "申报事由", "汇报人", "审核人", "备注"};
+ String[] unemployment = { "失业金申请日期", "申报事由", "汇报人", "审核人", "备注"};
EmpUnemployment empUnemployment=new EmpUnemployment();
empUnemployment.setCertificateNumb(empNum);
List<EmpUnemployment> empUnemployments = iEmpUnemploymentService.findEmpUnemployments(queryRequest, empUnemployment).getRecords();
//社保申请
- String[] insurance = { "序号","社保申请日期", "申请人", "社保档位", "是否已报告", "状态", "审核人", "备注"};
+ String[] insurance = { "社保申请日期", "申请人", "社保档位", "是否已报告", "状态", "审核人", "备注"};
EmpInsurance empInsurance=new EmpInsurance();
empInsurance.setCertificateNumb(empNum);
@@ -307,7 +307,7 @@
leaveInfo1.setApplayStatusName(applayStatus.get(leaveInfo1.getApplayStatus()==null?"":String.valueOf(leaveInfo1.getApplayStatus())));
}
//意外险案件
- String[] accidentCases = { "序号","受伤日期", "受伤地点", "受伤部位", "受伤经过描述", "意外险诊断", "就诊医院", "是否住院", "床号", "报案时间", "递交资料时间", "递交人", "医疗总费用", "保险赔付费用", "是否结案"};
+ String[] accidentCases = { "受伤日期", "受伤地点", "受伤部位", "受伤经过描述", "意外险诊断", "就诊医院", "是否住院", "床号", "报案时间", "递交资料时间", "递交人", "医疗总费用", "保险赔付费用", "是否结案"};
EmpAccidentCases empAccidentCases=new EmpAccidentCases();
empAccidentCases.setCertificateNumb(empNum);
@@ -317,7 +317,7 @@
leaveInfo1.setSettleStatusName(settleStatus.get(leaveInfo1.getSettleStatus()==null?"":leaveInfo1.getSettleStatus().toString()));
}
//工伤案件
- String[] occupational = { "序号","受伤日期", "受伤地点", "受伤部位", "受伤经过描述", "工伤诊断", "就诊医院", "就诊科室", "是否住院", "床号", "报案时间", "递交资料时间", "递交人", "医疗总费用", "已赔付医药费用", "是否结案"};
+ String[] occupational = { "受伤日期", "受伤地点", "受伤部位", "受伤经过描述", "工伤诊断", "就诊医院", "就诊科室", "是否住院", "床号", "报案时间", "递交资料时间", "递交人", "医疗总费用", "已赔付医药费用", "是否结案"};
EmpOccupational empOccupational=new EmpOccupational();
empOccupational.setCertificateNumb(empNum);
@@ -327,7 +327,7 @@
leaveInfo1.setSettleStatusName(settleStatus.get(leaveInfo1.getSettleStatus()==null?"":leaveInfo1.getSettleStatus().toString()));
}
//劳资案件
- String[] laborTrouble = { "序号","仲裁日期", "仲裁类型", "仲裁事由", "报备人", "备注", "仲裁赔付（元）", "是否结案", "案结日期"};
+ String[] laborTrouble = { "仲裁日期", "仲裁类型", "仲裁事由", "报备人", "备注", "仲裁赔付（元）", "是否结案", "案结日期"};
EmpLaborTrouble empLaborTrouble=new EmpLaborTrouble();
empLaborTrouble.setCertificateNumb(empNum);
@@ -337,13 +337,13 @@
leaveInfo1.setArbitrationStatusName(settleStatus.get(leaveInfo1.getArbitrationStatus()==null?"":String.valueOf(leaveInfo1.getArbitrationStatus())));
}
//不良记录
- String[] badRecord = { "序号","不良记录日期", "不良记录描述", "汇报人", "备注"};
+ String[] badRecord = { "不良记录日期", "不良记录描述", "汇报人", "备注"};
EmpBadRecord empBadRecord=new EmpBadRecord();
empBadRecord.setCertificateNumb(empNum);
List<EmpBadRecord> empBadRecords = iEmpBadRecordService.findEmpBadrecords(queryRequest, empBadRecord).getRecords();
//备注
- String[] remarkInfo = { "序号","备注日期", "备注信息"};
+ String[] remarkInfo = { "备注日期", "备注信息"};
EmpRemarkInfo empRemarkInfo=new EmpRemarkInfo();
empRemarkInfo.setCertificateNumb(empNum);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java
index 0d5eac1..533886f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java
@@ -335,22 +335,22 @@
DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
document.addHeader("标题","标题");
EmpBaseInfo empBaseInfo = empBaseInfoList.get(0);
- float[] ls={1.0f,3.0f,3.0f,3.0f,3.0f};
+ float[] ls={3.0f,3.0f,3.0f,3.0f};
PdfPTable workheadtable = createTable(ls);
- PdfPTable empPhysicalheadtable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable empContractInfotable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable empJobChangetable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable leaveInfotable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable resigntable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable dimissionAttendtable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable dimissionLogtable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable unemploymenttable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable insurancetable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
+ 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 accidentCasestable = createTable(new float[]{2.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
PdfPTable occtable = createTable(occupationallength);
- PdfPTable laborTroubletable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable badRecordtable = createTable(new float[]{1.0f,3.0f,3.0f,3.0f,3.0f});
- PdfPTable remarkInfotable = createTable(new float[]{1.0f,3.0f,3.0f});
+ 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});
Object[][] basicDatas = {
{"编号",empBaseInfo.getEmpNumb(),
"姓名",empBaseInfo.getEmpName(),
@@ -538,7 +538,6 @@
int size = empWorkExperiences1.size();
for (int i = 0; i < size; i++) {
EmpWorkExperience user = empWorkExperiences1.get(i);
- workheadtable.addCell(createCells(String.valueOf(re++), textfont));
workheadtable.addCell(createCell(user.getBeginDate()==null?"":format1.format(user.getBeginDate()), textfont));
workheadtable.addCell(createCell(user.getEndDate()==null?"":format1.format(user.getEndDate()), textfont));
workheadtable.addCell(createCell(user.getWorkUnit()==null?"":user.getWorkUnit(), textfont));
@@ -550,7 +549,6 @@
int size = records.size();
for (int i = 0; i < size; i++) {
EmpPhysicalExam user = records.get(i);
- empPhysicalheadtable.addCell(createCells(String.valueOf(re1++), textfont));
empPhysicalheadtable.addCell(createCell(user.getHospital()==null?"":user.getHospital(), textfont));
empPhysicalheadtable.addCell(createCell(user.getPhysicalExamDate()==null?"":format1.format(user.getPhysicalExamDate()), textfont));
empPhysicalheadtable.addCell(createCell(user.getPhysicalExamTypeName()==null?"":user.getPhysicalExamTypeName(), textfont));
@@ -567,7 +565,6 @@
int size = empContractInfos.size();
for (int i = 0; i < size; i++) {
EmpContractInfo user = empContractInfos.get(i);
- empContractInfotable.addCell(createCells(String.valueOf(re2++), textfont));
empContractInfotable.addCell(createCell(user.getSigningDate()==null?"":format1.format(user.getSigningDate()), textfont));
empContractInfotable.addCell(createCell(user.getEndDate()==null?"":format1.format(user.getEndDate()), textfont));
empContractInfotable.addCell(createCell(user.getContractPeriod()==null?"":String.valueOf(user.getContractPeriod()), textfont));
@@ -580,7 +577,6 @@
int size = empJobChangeList.size();
for (int i = 0; i < size; i++) {
Map user = empJobChangeList.get(i);
- empJobChangetable.addCell(createCells(String.valueOf(re3++), textfont));
empJobChangetable.addCell(createCell(user.get("newDeptName")==null?"":user.get("newDeptName").toString(), textfont));
empJobChangetable.addCell(createCell(user.get("newJobName")==null?"":user.get("newJobName").toString(), textfont));
empJobChangetable.addCell(createCell(user.get("empName")==null?"":user.get("empName").toString(), textfont));
@@ -595,7 +591,6 @@
int size = records1.size();
for (int i = 0; i < size; i++) {
Map user = records1.get(i);
- dimissionLogtable.addCell(createCells(String.valueOf(re4++), textfont));
dimissionLogtable.addCell(createCell(user.get("entryDate")==null?"":user.get("entryDate").toString(), textfont));
dimissionLogtable.addCell(createCell(user.get("dimissionDate")==null?"":user.get("dimissionDate").toString(), textfont));
dimissionLogtable.addCell(createCell(user.get("dimissionType")==null?"":user.get("dimissionType").toString(), textfont));
@@ -609,7 +604,6 @@
int size = empLeaveInfos.size();
for (int i = 0; i < size; i++) {
EmpLeaveInfo user = empLeaveInfos.get(i);
- leaveInfotable.addCell(createCells(String.valueOf(re5++), textfont));
leaveInfotable.addCell(createCell(user.getBeginTime()==null?"":format1.format(user.getBeginTime()), textfont));
leaveInfotable.addCell(createCell(user.getEndTime()==null?"":format1.format(user.getEndTime()), textfont));
leaveInfotable.addCell(createCell(user.getLeaveDay()==null?"":String.valueOf(user.getLeaveDay()), textfont));
@@ -624,7 +618,6 @@
int size = empResigns.size();
for (int i = 0; i < size; i++) {
EmpResign user = empResigns.get(i);
- resigntable.addCell(createCells(String.valueOf(re6++), textfont));
resigntable.addCell(createCell(user.getApplayDate()==null?"":format1.format(user.getApplayDate()), textfont));
resigntable.addCell(createCell(user.getReason()==null?"":user.getReason(), textfont));
resigntable.addCell(createCell(user.getReporter()==null?"":user.getReporter() , textfont));
@@ -636,7 +629,6 @@
int size = dimissionAttends.size();
for (int i = 0; i < size; i++) {
EmpDimissionAttend user = dimissionAttends.get(i);
- dimissionAttendtable.addCell(createCells(String.valueOf(re7++), textfont));
dimissionAttendtable.addCell(createCell(user.getAttendMonth()==null?"":user.getAttendMonth(), textfont));
dimissionAttendtable.addCell(createCell(user.getAttendDays()==null?"":user.getAttendDays().toString() , textfont));
dimissionAttendtable.addCell(createCell(user.getOvertimeDay()==null?"":user.getOvertimeDay().toString(), textfont));
@@ -652,7 +644,6 @@
int size = empUnemployments.size();
for (int i = 0; i < size; i++) {
EmpUnemployment user = empUnemployments.get(i);
- unemploymenttable.addCell(createCells(String.valueOf(re8++), textfont));
unemploymenttable.addCell(createCell(user.getApplayDate()==null?"":format1.format(user.getApplayDate()), textfont));
unemploymenttable.addCell(createCell(user.getApplayReason()==null?"":user.getApplayReason().toString() , textfont));
unemploymenttable.addCell(createCell(user.getReporter()==null?"":user.getReporter().toString(), textfont));
@@ -665,7 +656,6 @@
int size = empInsurances.size();
for (int i = 0; i < size; i++) {
EmpInsurance user = empInsurances.get(i);
- insurancetable.addCell(createCells(String.valueOf(re9++), textfont));
insurancetable.addCell(createCell(user.getApplayDate()==null?"":format1.format(user.getApplayDate()), textfont));
insurancetable.addCell(createCell(user.getProposer()==null?"":user.getProposer().toString() , textfont));
insurancetable.addCell(createCell(user.getInsuranceGaers()==null?"":user.getInsuranceGaers().toString(), textfont));
@@ -680,7 +670,6 @@
int size = empAccidentCases1.size();
for (int i = 0; i < size; i++) {
EmpAccidentCases user = empAccidentCases1.get(i);
- accidentCasestable.addCell(createCells(String.valueOf(re10++), textfont));
accidentCasestable.addCell(createCell(user.getInjuredTime()==null?"":format1.format(user.getInjuredTime()), textfont));
accidentCasestable.addCell(createCell(user.getInjuredAddress()==null?"":user.getInjuredAddress().toString() , textfont));
accidentCasestable.addCell(createCell(user.getInjuredPart()==null?"":user.getInjuredPart().toString(), textfont));
@@ -702,7 +691,6 @@
int size = empLaborTroubles.size();
for (int i = 0; i < size; i++) {
EmpLaborTrouble user = empLaborTroubles.get(i);
- laborTroubletable.addCell(createCells(String.valueOf(re11++), textfont));
laborTroubletable.addCell(createCell(user.getArbitrationDate()==null?"":format1.format(user.getArbitrationDate()), textfont));
laborTroubletable.addCell(createCell(user.getArbitrationTypeName()==null?"":user.getArbitrationTypeName().toString() , textfont));
laborTroubletable.addCell(createCell(user.getArbitrationReason()==null?"":user.getArbitrationReason().toString(), textfont));
@@ -718,7 +706,6 @@
int size = empOccupationals.size();
for (int i = 0; i < size; i++) {
EmpOccupational user = empOccupationals.get(i);
- occtable.addCell(createCells(String.valueOf(re12++), textfont));
occtable.addCell(createCell(user.getInjuredTime()==null?"":format1.format(user.getInjuredTime()), textfont));
occtable.addCell(createCell(user.getInjuredAddress()==null?"":user.getInjuredAddress().toString() , textfont));
occtable.addCell(createCell(user.getInjuredPart()==null?"":user.getInjuredPart().toString(), textfont));
@@ -741,7 +728,6 @@
int size = empBadRecords.size();
for (int i = 0; i < size; i++) {
EmpBadRecord user = empBadRecords.get(i);
- badRecordtable.addCell(createCells(String.valueOf(re13++), textfont));
badRecordtable.addCell(createCell(user.getBadDate()==null?"":format1.format(user.getBadDate()), textfont));
badRecordtable.addCell(createCell(user.getBadContent()==null?"":user.getBadContent().toString() , textfont));
badRecordtable.addCell(createCell(user.getReporter()==null?"":user.getReporter().toString(), textfont));
@@ -753,7 +739,6 @@
int size = empRemarkInfos.size();
for (int i = 0; i < size; i++) {
EmpRemarkInfo user = empRemarkInfos.get(i);
- remarkInfotable.addCell(createCells(String.valueOf(re14++), textfont));
remarkInfotable.addCell(createCell(user.getRemarkDate()==null?"":format1.format(user.getRemarkDate()), textfont));
remarkInfotable.addCell(createCell(user.getRemarkContent()==null?"":user.getRemarkContent().toString() , textfont));
}
--
Gitblit v1.8.0