From c5a10bec4d25f25464105233bebfaf8c791aba17 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 08 三月 2021 17:12:12 +0800
Subject: [PATCH] 提交

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
index 84af51c..c448cdc 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
@@ -179,6 +179,12 @@
 			for (DicItem m:  empAccessoryMapper.getDictType("certificateList")) {
 				certificateList.put(m.getDicItemCode(),m.getDicItemName());
 			}
+			//相关证件
+			Map<String,String> archivesStatus= new HashMap<>();
+			for (DicItem m:  empAccessoryMapper.getDictType("archivesStatus")) {
+				archivesStatus.put(m.getDicItemCode(),m.getDicItemName());
+			}
+
 			logger.info(">>>>>>>>>>开始导出pdf>>>>>>>>>>");
 			//基本信息
 				String[] baseinfo = { "档案号", "姓名", "性别", "部门(护卫点)", "岗位", "员工类别", "民族", "年龄", "婚姻状态", "身份证有效期"
@@ -193,6 +199,7 @@
 			
 			List<EmpBaseInfo> empBaseInfoList = iEmpBaseInfoService.findEmpBaseInfos(queryRequest, baseInfo).getRecords();
 			for (EmpBaseInfo empBaseInfo: empBaseInfoList){
+				empBaseInfo.setArchivesStatusName(archivesStatus.get(empBaseInfo.getArchivesStatus()==null?"":empBaseInfo.getArchivesStatus()));
 				empBaseInfo.setSexName(sex.get(empBaseInfo.getSex()==null?"":empBaseInfo.getSex()));
 				empBaseInfo.setEmpTypeName(empType.get(empBaseInfo.getEmpType()==null?"":empBaseInfo.getEmpType()));
 				empBaseInfo.setNationName(NATION.get(empBaseInfo.getNation()==null?"":empBaseInfo.getNation()));

--
Gitblit v1.8.0