提交

孔祥富

2021-03-07 eb75ecc4eacb90f786ddf2e64c00547496345eeb

提交

 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

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

@@ -161,6 +161,10 @@
        cell.setPhrase(new Phrase(value, font));
        cell.setPadding(3.0f);
        if (!boderFlag) {
            cell.setBorderColorBottom(BaseColor.GRAY);
            cell.setBorderColorLeft(BaseColor.GRAY);
            cell.setBorderColorRight(BaseColor.GRAY);
            cell.setBorderColorTop(BaseColor.GRAY);
            cell.setBorder(0);
            cell.setPaddingTop(15.0f);
            cell.setPaddingBottom(8.0f);
@@ -218,7 +222,7 @@
    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);
@@ -230,10 +234,10 @@
        cell.setBorderWidthBottom(0.1f);
        cell.setBorderWidthLeft(0.1f);
        cell.setBorderWidthRight(0.1f);
        cell.setBorderColorBottom(BaseColor.BLACK);
        cell.setBorderColorLeft(BaseColor.BLACK);
        cell.setBorderColorRight(BaseColor.BLACK);
        cell.setBorderColorTop(BaseColor.BLACK);
        cell.setBorderColorBottom(BaseColor.GRAY);
        cell.setBorderColorLeft(BaseColor.GRAY);
        cell.setBorderColorRight(BaseColor.GRAY);
        cell.setBorderColorTop(BaseColor.GRAY);
        cell.setPadding(3);
    }
    /**
@@ -471,7 +475,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();