From 4fe77f83783b35d9e541d6dd56d95b40f0af0670 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 三月 2021 07:19:41 +0800
Subject: [PATCH] fix(bug修复): 重新打开档案时，将原离职日期设置成1900-01-01，以便前端不再显示
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
index ed3ce26..f9646e9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
@@ -214,21 +214,27 @@
empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
}
empInsurance.setProposer(list.get(6).toString());
- //婚姻状况
+ //社保档位
DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"insuranceGaers")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
if (null!=dicItem){
empInsurance.setInsuranceGaers(dicItem.getDicItemCode());
}
- if (StringUtils.isNotBlank(list.get(8).toString())) {
- empInsurance.setReportStatus("未报告".equals(list.get(8).toString()) ? 0 : 1);
+
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"reportStatus")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empInsurance.setReportStatus(Integer.valueOf(dicItem.getDicItemCode()));
}
- if (StringUtils.isNotBlank(list.get(8).toString())) {
- empInsurance.setApplayStatus("未申请".equals(list.get(8).toString()) ? 0 : 1);
+
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"applayStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empInsurance.setApplayStatus(Integer.valueOf(dicItem.getDicItemCode()));
}
- empInsurance.setAuditor(list.get(9).toString());
- empInsurance.setRemark(list.get(10).toString());
+
+ empInsurance.setAuditor(list.get(10).toString());
+ empInsurance.setRemark(list.get(11).toString());
empInsurance.setEmpStatus(empBaseInfo.getEmpStatus());
+ empInsurance.setCreator(FebsUtil.getUserId());
this.save(empInsurance);
}
}
--
Gitblit v1.8.0