From 0f86fe76d4d4fa5a4fa1e8661c6b40de87cdd2aa Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 15 四月 2021 21:58:37 +0800
Subject: [PATCH] fix(bug修复): 导出pdf时相关证件多选的转换
---
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 f9646e9..0389fad 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
@@ -89,7 +89,7 @@
}
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);
@@ -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