From c5cf095903c50112f71612272911d53e9c86b7e0 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 12 三月 2021 09:10:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 533886f..07d9891 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
@@ -346,7 +346,7 @@
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 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});
@@ -584,6 +584,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