Merge remote-tracking branch 'origin/master'

yz

2021-03-09 dfed60326c07756d3710d74c3aa44b537602adda

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

@@ -334,7 +334,7 @@
      PdfPTable badRecordtable = createTable(badRecordlength);
      PdfPTable remarkInfotable = createTable(remarkInfolength);
      Object[][] basicDatas = {
            {"档案号",empBaseInfo.getEmpNumb(),
            {"编号",empBaseInfo.getEmpNumb(),
                  "姓名",empBaseInfo.getEmpName(),
                  "性别",empBaseInfo.getSexName()},
            {"部门(护卫点)",empBaseInfo.getDeptName(),
@@ -345,7 +345,7 @@
                  "婚姻状态",empBaseInfo.getMarriageName()==null?"":empBaseInfo.getMarriageName()},
            {"身份证有效期",empBaseInfo.getCertificateValidity()==null?"":format1.format(empBaseInfo.getCertificateValidity()),
                  "身高(cm)",empBaseInfo.getStature()==null?"":empBaseInfo.getStature(),
                  "政治面貌",empBaseInfo.getNativePlaceName()==null?"":empBaseInfo.getNativePlaceName()},
                  "政治面貌",empBaseInfo.getPoliticsName()==null?"":empBaseInfo.getPoliticsName()},
            {"出生日期",empBaseInfo.getBirthdate()==null?"":format1.format(empBaseInfo.getBirthdate()),
                  "最高学历",empBaseInfo.getEducationName()==null?"":empBaseInfo.getEducationName(),
                  "籍贯",empBaseInfo.getNativePlaceName()==null?"":empBaseInfo.getNativePlaceName()},
@@ -353,7 +353,7 @@
                  "现住址",empBaseInfo.getCurrentAddress()==null?"":empBaseInfo.getCurrentAddress(),
                  "保安员回执",empBaseInfo.getReturnReceipt()==null?"":empBaseInfo.getReturnReceipt()},
            {"保安员证号",empBaseInfo.getGuardNumb()==null?"":empBaseInfo.getGuardNumb(),
                  "档案情况",empBaseInfo.getArchivesStatus()==null?"":empBaseInfo.getArchivesStatus(),
                  "档案情况",empBaseInfo.getArchivesStatusName()==null?"":empBaseInfo.getArchivesStatusName(),
                  "银行名称",empBaseInfo.getBankName()==null?"":empBaseInfo.getBankName()},
            {"银行账号",empBaseInfo.getBankNumb()==null?"":empBaseInfo.getBankNumb(),
                  "电话号码",empBaseInfo.getTelePhone()==null?"":empBaseInfo.getTelePhone(),