From f23bd39c73f371b4be0f010a0cb9e86b84b94ae1 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 02 三月 2021 23:29:53 +0800
Subject: [PATCH] feat(离职员工): 打开档案
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index 715276c..6af90f9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -1,10 +1,12 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
+import cn.hutool.core.date.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -16,8 +18,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.system.Dept;
+import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
import java.util.*;
@@ -35,6 +40,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpRemarkInfoServiceImpl extends ServiceImpl<EmpRemarkInfoMapper, EmpRemarkInfo> implements IEmpRemarkinfoService {
+ private final RedisService redisService;
private final EmpRemarkInfoMapper empRemarkinfoMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -59,6 +65,9 @@
if (StringUtils.isNotBlank(empRemarkinfo.getRemarkDateStr())) {
queryWrapper.between(EmpRemarkInfo::getRemarkDate, empRemarkinfo.getRemarkDateStr().split(",")[0],
empRemarkinfo.getRemarkDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empRemarkinfo.getRemarkContent())) {
+ queryWrapper.like(EmpRemarkInfo::getRemarkContent, empRemarkinfo.getRemarkContent());
}
Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
@@ -123,4 +132,27 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empRemarkinfoMapper.momentToNormal(list, operatorId)>0;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpRemarkInfo(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
+ empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empRemarkinfo.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
+ .getDeptId();
+ empRemarkinfo.setDeptName(list.get(1).toString());
+ empRemarkinfo.setDeptId(deptId);
+ empRemarkinfo.setJobName(list.get(2).toString());
+ empRemarkinfo.setEmpName(list.get(3).toString());
+ empRemarkinfo.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empRemarkinfo.setRemarkDate(DateUtil.parseDateTime(list.get(5).toString()));
+ }
+ empRemarkinfo.setRemarkContent(list.get(6).toString());
+ this.save(empRemarkinfo);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0