From 44cca7956f99c8960fbdf877f78695221f8bcb17 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 05 五月 2024 21:24:41 +0800
Subject: [PATCH] fix: 问题修复 1.数据统计模块中查看合同出错
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 f916a02..736f0b5 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
@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
public class ExportPdfServiceImpl implements ExportPdfService {
@@ -217,7 +218,7 @@
.orElse(""));
empBaseInfo.setInsuranceTypeName(INSURANCETYPE.get(empBaseInfo.getInsuranceType()==null?"":empBaseInfo.getInsuranceType()));
empBaseInfo.setHandbookStatusName(handbookStatus.get(empBaseInfo.getHandbookStatus()==null?"":empBaseInfo.getHandbookStatus()));
- empBaseInfo.setCertificateListName(certificateList.get(empBaseInfo.getCertificateList()==null?"":empBaseInfo.getCertificateList()));
+ empBaseInfo.setCertificateListName(getCertificateListName(empBaseInfo.getCertificateList(), certificateList));
empBaseInfo.setEmpStatusName("0".equals(empBaseInfo.getEmpStatus()) ? "在职" : "离职");
empBaseInfo.setEntryTypeName(dicItems.stream()
.filter(k -> DicCode.IN_OUT_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(empBaseInfo.getEntryType()))
@@ -282,7 +283,7 @@
List<EmpDimissionAttend> dimissionAttends = iEmpDimissionAttendService.findEmpDimissionattends(queryRequest, empDimissionAttend).getRecords();
//入离职记录
- String[] dimissionLog = { "入职日期", "离职日期", "离职类型", "自离天数", "报备人", "备注"};
+ String[] dimissionLog = { "部门/护卫点", "入职日期", "离职日期", "离职类型", "自离天数", "报备人", "备注"};
EmpDimissionLog empDimissionLog=new EmpDimissionLog();
empDimissionLog.setEmpId(empBaseInfo.getEmpId());
empDimissionLog.setEmpStatus(empBaseInfo.getEmpStatus());
@@ -408,4 +409,22 @@
}
return null;
}
+
+ private String getCertificateListName(String certificateList, Map<String,String> mapCertificate) {
+ String tempName;
+ List<String> nameList = new ArrayList<>();
+ String[] tempList = certificateList.split(",");
+ // certificateList.get(empBaseInfo.getCertificateList()
+ if (tempList.length > 0) {
+ for (int i = 0, len = tempList.length; i < len; i++) {
+ String tempValue = tempList[i];
+ tempName = mapCertificate.get(tempValue)==null?tempValue:mapCertificate.get(tempValue);
+ nameList.add(tempName);
+ }
+ tempName = nameList.stream().collect(Collectors.joining(", "));
+ } else {
+ tempName = "";
+ }
+ return tempName;
+ }
}
--
Gitblit v1.8.0