From 6d240fbbf6a47b4125320f26c4f5c537e1493fb6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 十一月 2021 22:19:12 +0800
Subject: [PATCH] fix(bug修复): 到期合同的统计条件修改为只针对在职员工统计
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 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 2355373..7eaf2e0 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],
@@ -85,11 +85,11 @@
queryWrapper.eq("a.ReportStatus", empInsurance.getReportStatus());
}
if (StringUtils.isNotBlank(empInsurance.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empInsurance.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empInsurance.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
IPage<EmpInsurance> iPage = empInsuranceMapper.selectPageVo(page, queryWrapper);
List<EmpInsurance> list = iPage.getRecords();
List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
@@ -190,6 +190,9 @@
empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empInsurance.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if(null == depts){
+ depts =remoteDeptService.setDeptRedis();
+ }
Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
if (null == dept) {
returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
@@ -200,32 +203,44 @@
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());
empInsurance.setJobName(list.get(2).toString());
empInsurance.setEmpName(list.get(3).toString());
empInsurance.setCertificateNumb(list.get(4).toString());
- if (StringUtils.isNotBlank(list.get(5).toString())) {
- empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empInsurance.setApplayDate(DateUtil.parse(list.get(5).toString()));
+ }
+ }catch (Exception e){
+ returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
}
+
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());
}
- 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