From b8d038947e66850f1a6ec1f93e1805ba33f6fdc0 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期日, 07 三月 2021 21:44:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/resources/application.properties | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.xml | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java | 102 +++++++++++++++++++++++++++++++++++----------------
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/GetFilePlace.java | 6 +-
4 files changed, 75 insertions(+), 37 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.xml
index db08152..c38c0db 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper">
- <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpRemarkInfo">
+ <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpBadRecord">
select a.* from t_emp_badrecord a
inner join t_emp_baseinfo b on a.empId = b.empId
inner join t_dept c on b.deptId = c.DEPT_ID
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 20bb058..c976b4c 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
@@ -78,7 +78,7 @@
}
}
- int maxWidth = 842;
+ int maxWidth = 800;
/**
* 为表格添加一个内容
@@ -138,35 +138,7 @@
return cell;
}
- /**
- * 为表格添加一个内容
- *
- * @param value
- * 值
- * @param font
- * 字体
- * @param align
- * 对齐方式
- * @param colspan
- * 占多少列
- * @param boderFlag
- * 是否有有边框
- * @return 添加的文本框
- */
- public PdfPCell createCell(String value, Font font, int align, int colspan, boolean boderFlag) {
- PdfPCell cell = new PdfPCell();
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(align);
- cell.setColspan(colspan);
- cell.setPhrase(new Phrase(value, font));
- cell.setPadding(3.0f);
- if (!boderFlag) {
- cell.setBorder(0);
- cell.setPaddingTop(15.0f);
- cell.setPaddingBottom(8.0f);
- }
- return cell;
- }
+
/**
* 创建一个表格对象
@@ -215,10 +187,44 @@
Font fontChinese = new Font(bfChinese, 12, Font.NORMAL);
return fontChinese;
}
+ /**
+ * 为表格添加一个内容
+ *
+ * @param value
+ * 值
+ * @param font
+ * 字体
+ * @param align
+ * 对齐方式
+ * @param colspan
+ * 占多少列
+ * @param boderFlag
+ * 是否有有边框
+ * @return 添加的文本框
+ */
+ public PdfPCell createCell(String value, Font font, int align, int colspan, boolean boderFlag) {
+ PdfPCell cell = new PdfPCell();
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(align);
+ cell.setColspan(colspan);
+ cell.setPhrase(new Phrase(value, font));
+ cell.setPadding(3.0f);
+ cell.setMinimumHeight(30);
+ cell.setBorderColorBottom(BaseColor.BLACK);
+ cell.setBorderColorLeft(BaseColor.BLACK);
+ cell.setBorderColorRight(BaseColor.BLACK);
+ cell.setBorderColorTop(BaseColor.BLACK);
+ if (!boderFlag) {
+ cell.setBorder(0);
+ cell.setPaddingTop(15.0f);
+ cell.setPaddingBottom(8.0f);
+ }
+ return cell;
+ }
public static void setTableStyle(PdfPTable table, PdfPCell cell) {
// 设置表格样式
table.setLockedWidth(true);
- table.setTotalWidth(500);
+ table.setTotalWidth(800);
table.setHorizontalAlignment(Element.ALIGN_LEFT);
// 设置单元格样式
cell.setMinimumHeight(35);
@@ -362,6 +368,38 @@
"员工手册",empBaseInfo.getHandbookStatusName()==null?"":empBaseInfo.getHandbookStatusName(),
"相关证件",empBaseInfo.getCertificateListName()==null?"":empBaseInfo.getCertificateListName()},
{"身份证号码",empBaseInfo.getCertificateNumb()==null?"":empBaseInfo.getCertificateNumb()}};
+
+
+
+
+ //生成三列表格
+ PdfPTable table1 = new PdfPTable(1);
+ PdfPCell cell1 = new PdfPCell();
+ cell1.setBorderWidthTop(0);
+ cell1.setBorderWidthRight(0);
+ cell1.setBorderWidthBottom(0);
+ cell1.setBorderWidthLeft(0);
+ cell1.setUseAscender(true);
+
+ cell1.setUseDescender(true);
+ cell1.setHorizontalAlignment(PdfPCell.ALIGN_CENTER);//水平居中
+ Paragraph para = null;
+ try {
+ para = new Paragraph(empBaseInfo.getEmpName()+"的档案", getPdfChineseFont());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ //设置该段落为居中显示
+ cell1.setPhrase(para);
+ table1.addCell(cell1);
+
+
+
+
+
+
+
+
// 每个cell的宽度
float[] widthss = {400, 400, 400, 400,400, 400};
// 创建一个表格，每一行有四个cell
@@ -471,7 +509,6 @@
for (int i = 0; i < remarkInfolength; i++) {
remarkInfotable.addCell(createCell(remarkInfo[i], keyfont, Element.ALIGN_CENTER));
}
-
if (null != empWorkExperiences1 && empWorkExperiences1.size() > 0) {
int size = empWorkExperiences1.size();
@@ -666,6 +703,7 @@
}
}
try {
+ document.add(table1);
// 将表格添加到文档中
document.add(basicTable);
document.add(workheadtable);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/GetFilePlace.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/GetFilePlace.java
index a79a057..e018b4b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/GetFilePlace.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/GetFilePlace.java
@@ -12,10 +12,10 @@
*/
public String getFilePath() {
String dir = System.getProperty("user.dir"); // 获得tomcat所在的工作路径
-
+ String realDir = dir + File.separator+ "febs-server" + File.separator
+ + "febs-server-hr" + File.separator+ "src" + File.separator + "main" + File.separator + "resources"
+ + File.separator + "application.properties";
// 获取到存储了文件存储位置的filedir.properties 文件路径 --->java Project的文件路径
- String realDir = dir + File.separator +File.separator + "application.properties";
-
return realDir;
}
diff --git a/febs-server/febs-server-hr/src/main/resources/application.properties b/febs-server/febs-server-hr/src/main/resources/application.properties
index 024caaa..dc8528b 100644
--- a/febs-server/febs-server-hr/src/main/resources/application.properties
+++ b/febs-server/febs-server-hr/src/main/resources/application.properties
@@ -1,2 +1,2 @@
#pdf存放目录
-pdfPath=D\:/appDataPdf
\ No newline at end of file
+pdfPath=C\:/appDataPdf
\ No newline at end of file
--
Gitblit v1.8.0