From 6a12ce06674bdbee846144d7e21e9fff8d4c5ef3 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 12 三月 2021 02:36:13 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 a30a0a0..8e8e7a8 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
@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
@@ -81,7 +82,7 @@
queryWrapper.eq("a.ReportStatus", empInsurance.getReportStatus());
}
if (StringUtils.isNotBlank(empInsurance.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empInsurance.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empInsurance.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -165,7 +166,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpInsurance(List<List<Object>> listObject,List<String> returnList) {
+ public void importEmpInsurance(List<List<Object>> listObject,List<String> returnList, List<DicItem> dicItems) {
for (List<Object> list : listObject) {
if (list.size()==0){
continue;
@@ -195,7 +196,12 @@
empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
}
empInsurance.setProposer(list.get(6).toString());
- empInsurance.setInsuranceGaers(list.get(7).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);
}
--
Gitblit v1.8.0