From 7b720f18f1824a7c9882e2404087cbf3793914e3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 三月 2021 23:42:28 +0800
Subject: [PATCH] fix(bug修复): 在职员工信息录入时，同步增加一条入职记录
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
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 54b71cf..93c3e81 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
@@ -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;
@@ -584,6 +585,8 @@
empJobChangetable.addCell(createCell(user.get("oldJobName")==null?"":user.get("oldJobName").toString(), textfont));
empJobChangetable.addCell(createCell(user.get("changeDate")==null?"":user.get("changeDate").toString(), textfont));
empJobChangetable.addCell(createCell(user.get("changeType")==null?"":user.get("changeType").toString(), textfont));
+ empJobChangetable.addCell(createCell(user.get("changeReason")==null?"":user.get("changeReason").toString(), textfont));
+
}
}
int re4=1;
--
Gitblit v1.8.0