From 179ace046094b9d84a8596ea78c9702390d5a56b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 25 三月 2021 15:34:44 +0800
Subject: [PATCH] fix(bug修复): excel导出日期处理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index dbce0b1..c32a5db 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -24,6 +24,7 @@
import cc.mrbird.febs.server.hr.util.PoiExportExcel;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -92,7 +93,7 @@
@Override
public IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "entryDate", FebsConstant.ORDER_ASC, true);
IPage<EmpBaseInfo> iPage = empBaseInfoMapper.selectPageVo(page, createQueryWrapper(empBaseInfo));
//设置部门
// List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
@@ -496,7 +497,22 @@
empBaseInfo.setJobId(position.getPositionId());
empBaseInfo.setJobName(list.get(3).toString());
empBaseInfo.setEmpName(list.get(4).toString());
- empBaseInfo.setCertificateNumb(list.get(5).toString());
+ try {
+ if(StrUtil.isNotBlank(list.get(5).toString())){
+ empBaseInfo.setCertificateNumb(list.get(5).toString());
+ if (IdcardUtil.isValidCard(list.get(5).toString())){
+ empBaseInfo.setAge(IdcardUtil.getAgeByIdCard(list.get(5).toString()));
+ empBaseInfo.setBirthdate(IdcardUtil.getBirthDate(list.get(5).toString()));
+ }
+ }
+
+ }catch (Exception e){
+ log.error("导入人员身份证异常：{}",e);
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}检查身份证是否正确", listObject.indexOf(list) + 1, list.get(5).toString()));
+ continue;
+ }
+
+
empBaseInfo.setSex("男".equals(list.get(6).toString()) ? "1" : "2");
//民族
--
Gitblit v1.8.0