From ffe2284c7888b813fcdd6e26d2f2eccc45d58d44 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 26 二月 2021 23:22:07 +0800
Subject: [PATCH] 修复在职员工导出字段不一致问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
index 1488921..9be1689 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
+import cn.hutool.core.date.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -16,8 +17,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 +39,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
+ private final RedisService redisService;
private final EmpBadRecordMapper empBadrecordMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -59,6 +64,9 @@
if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
queryWrapper.between(EmpBadRecord::getBadDate, empBadrecord.getBadDateStr().split(",")[0],
empBadrecord.getBadDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getBadContent())) {
+ queryWrapper.like(EmpBadRecord::getBadContent, empBadrecord.getBadContent());
}
Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
@@ -123,4 +131,29 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empBadrecordMapper.momentToNormal(list, operatorId) > 0;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpBadRecord(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpBadRecord empBadrecord=new EmpBadRecord();
+ empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empBadrecord.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();
+ empBadrecord.setDeptName(list.get(1).toString());
+ empBadrecord.setDeptId(deptId);
+ empBadrecord.setJobName(list.get(2).toString());
+ empBadrecord.setEmpName(list.get(3).toString());
+ empBadrecord.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empBadrecord.setBadDate(DateUtil.parseDateTime(list.get(5).toString()));
+ }
+ empBadrecord.setBadContent(list.get(6).toString());
+ empBadrecord.setReporter(list.get(7).toString());
+ empBadrecord.setRemark(list.get(8).toString());
+ this.save(empBadrecord);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0