From 17e79b16f252d46deffb9e0223a45cb14f930448 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 21:47:17 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 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 b22482d..55ed906 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
@@ -1,15 +1,20 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,35 +49,42 @@
private final RedisService redisService;
private final EmpBadRecordMapper empBadrecordMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
+ private final IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
- LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpBadRecord::getDelFlag, empBadrecord.getDelFlag());
- if (StringUtils.isNotBlank(empBadrecord.getEmpNumb())) {
- queryWrapper.like(EmpBadRecord::getEmpNumb, empBadrecord.getEmpNumb());
+ QueryWrapper<EmpBadRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag", empBadrecord.getDelFlag());
+ if (StringUtils.isNotBlank(empBadrecord.getEmpNumb())) {
+ queryWrapper.like("a.EmpNumb", empBadrecord.getEmpNumb());
}
if (StringUtils.isNotBlank(empBadrecord.getEmpName())) {
- queryWrapper.like(EmpBadRecord::getEmpName, empBadrecord.getEmpName());
+ queryWrapper.like("a.EmpName", empBadrecord.getEmpName());
}
if (StringUtils.isNotBlank(empBadrecord.getCertificateNumb())) {
- queryWrapper.like(EmpBadRecord::getCertificateNumb, empBadrecord.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empBadrecord.getCertificateNumb());
}
if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
- queryWrapper.like(EmpBadRecord::getDeptName, empBadrecord.getDeptName());
+ queryWrapper.like("a.DeptName", empBadrecord.getDeptName());
}
if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
- queryWrapper.between(EmpBadRecord::getBadDate, empBadrecord.getBadDateStr().split(",")[0],
- empBadrecord.getBadDateStr().split(",")[1]);
+ queryWrapper.between("a.badDate", empBadrecord.getBadDateStr().split(",")[0],empBadrecord.getBadDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empBadrecord.getBadContent())) {
- queryWrapper.like(EmpBadRecord::getBadContent, empBadrecord.getBadContent());
+ queryWrapper.like("a.badContent", empBadrecord.getBadContent());
}
+ if (StringUtils.isNotBlank(empBadrecord.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empBadrecord.getEmpStatus().split(","));
+ } else {
+ queryWrapper.in("b.EmpStatus", 0);
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ return empBadrecordMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -154,14 +166,27 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpBadRecord(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
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();
+ 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()));
+ continue;
+ }
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ if (null == empId){
+ returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ empBadrecord.setDelFlag(2);
+ empBadrecord.setEmpId(empId);
empBadrecord.setDeptName(list.get(1).toString());
- empBadrecord.setDeptId(deptId);
+ empBadrecord.setDeptId(dept.getDeptId());
empBadrecord.setJobName(list.get(2).toString());
empBadrecord.setEmpName(list.get(3).toString());
empBadrecord.setCertificateNumb(list.get(4).toString());
--
Gitblit v1.8.0