From db6a13645ba212dee0ef46548cc3468d30b76873 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 24 五月 2021 21:29:05 +0800
Subject: [PATCH] feat(定时更新基本信息表的部门名称与全称):
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 6 +++---
1 files changed, 3 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 2ddfda9..55e1564 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
@@ -72,7 +72,7 @@
queryWrapper.like("a.CertificateNumb", empInsurance.getCertificateNumb());
}
if (StringUtils.isNotBlank(empInsurance.getDeptName())) {
- queryWrapper.like("a.DeptName", empInsurance.getDeptName());
+ queryWrapper.like("b.allDeptName", empInsurance.getDeptName());
}
if (StringUtils.isNotBlank(empInsurance.getApplayDateStr())) {
queryWrapper.between("a.ApplayDate", empInsurance.getApplayDateStr().split(",")[0],
@@ -203,7 +203,7 @@
returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empInsurance.setDelFlag(2);
+ empInsurance.setDelFlag(0);
empInsurance.setEmpId(empBaseInfo.getEmpId());
empInsurance.setDeptName(list.get(1).toString());
empInsurance.setDeptId(dept.getDeptId());
@@ -215,7 +215,7 @@
}
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);
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"INSURANCETYPE")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
if (null!=dicItem){
empInsurance.setInsuranceGaers(dicItem.getDicItemCode());
}
--
Gitblit v1.8.0