xx

孔祥富

2021-03-09 c3a6b64f474a112b55b0693126721f295d1d1279

xx

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java

@@ -161,9 +161,9 @@
            }
            //籍贯
            Map<String,String> NATIVEPLACE= new HashMap<>();
            /*for (DicItem m:    (List<DicItem>)iRemoteDicItemService.dictType("NATIVEPLACE")) {
            for (DicItem m:    (List<DicItem>)iRemoteDicItemService.dictType("NATIVEPLACE")) {
                NATIVEPLACE.put(m.getDicItemCode(),m.getDicItemName());
            }*/
            }
            //保险类型
            Map<String,String> INSURANCETYPE= new HashMap<>();
            for (DicItem m:   empAccessoryMapper.getDictType("INSURANCETYPE")) {

 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()},