Merge remote-tracking branch 'origin/master'
| | |
| | | continue; |
| | | } |
| | | EmpWorkExperience workExperience = new EmpWorkExperience(); |
| | | workExperience.setEmpId(empId); |
| | | workExperience.setDeptName(list.get(4).toString()); |
| | | workExperience.setDeptId(dept.getDeptId()); |
| | | workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE)); |
| | |
| | | } |
| | | //籍贯 |
| | | 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")) { |
| | |
| | | PdfPTable badRecordtable = createTable(badRecordlength); |
| | | PdfPTable remarkInfotable = createTable(remarkInfolength); |
| | | Object[][] basicDatas = { |
| | | {"档案号",empBaseInfo.getEmpNumb(), |
| | | {"编号",empBaseInfo.getEmpNumb(), |
| | | "姓名",empBaseInfo.getEmpName(), |
| | | "性别",empBaseInfo.getSexName()}, |
| | | {"部门(护卫点)",empBaseInfo.getDeptName(), |
| | |
| | | "婚姻状态",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()}, |