From 3014d7c96c13c7e032d5a7dfee7faf193afc557f Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 23 三月 2021 22:16:32 +0800
Subject: [PATCH] 修改导入
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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 8e8e7a8..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
@@ -1,8 +1,11 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
@@ -86,7 +89,19 @@
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
- return empInsuranceMapper.selectPageVo(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ IPage<EmpInsurance> iPage = empInsuranceMapper.selectPageVo(page, queryWrapper);
+ List<EmpInsurance> list = iPage.getRecords();
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setInsuranceGaersName(dicItems.stream()
+ .filter(k -> DicCode.INSURANCE_GAERS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getInsuranceGaers()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("未知"));
+ });
+ iPage.setRecords(list);
+ return iPage;
}
@Override
@@ -168,13 +183,16 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpInsurance(List<List<Object>> listObject,List<String> returnList, List<DicItem> dicItems) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
EmpInsurance empInsurance = new EmpInsurance();
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()));
@@ -196,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