From 65f1296728ac4a2c207d411b50659af683628413 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 30 七月 2021 09:22:39 +0800
Subject: [PATCH] fix: 导入新员工时也同步写一条入职记录
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
index bdffe36..91ba8cc 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
@@ -1,9 +1,20 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.utils.CastUtil;
+import cc.mrbird.febs.common.core.utils.SortUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
+
+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;
import org.springframework.transaction.annotation.Propagation;
@@ -13,6 +24,7 @@
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.constant.StringConstant;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
@@ -33,16 +45,54 @@
class EmpJobChangeServiceImpl extends ServiceImpl<EmpJobChangeMapper, EmpJobChange> implements IEmpJobChangeService {
private final EmpJobChangeMapper empJobchangeMapper;
+ private final IRemoteDeptService remoteDeptService;
+ private final RedisService redisService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
- public IPage<EmpJobChange> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange) {
- LambdaQueryWrapper<EmpJobChange> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpJobChange::getDelFlag, 0);
+ public IPage<Map<String,Object>> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange) {
+ QueryWrapper<EmpJobChange> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag", 0);
+ if (StringUtils.isNotBlank(empJobchange.getEmpNumb())) {
+ queryWrapper.like("b.empNumb", empJobchange.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getEmpName())) {
+ queryWrapper.like("a.empName", empJobchange.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getCertificateNumb())) {
+ queryWrapper.like("b.certificateNumb", empJobchange.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getDeptName())) {
+ queryWrapper.like("c.allDeptName", empJobchange.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getChangeDateStr())) {
+ queryWrapper.between("a.changeDate", empJobchange.getChangeDateStr().split(",")[0], empJobchange.getChangeDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empJobchange.getChangeType())) {
+ queryWrapper.eq("a.changeType", empJobchange.getChangeType());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empJobchange.getEmpStatus().split(","));
+ }
Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "changeDate", FebsConstant.ORDER_ASC, true);
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ IPage<Map<String,Object>> iPage = this.baseMapper.selectPageVo(page, queryWrapper);
+ List<Map<String,Object>> list =iPage.getRecords();
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p->{
+ String jobChangeTypeName = dicItems.stream()
+ .filter(k -> DicCode.JOB_CHANGE_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.get("changeType")))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("未知");
+ p.put("changeTypeName", jobChangeTypeName);
+ });
+ iPage.setRecords(list);
+ return iPage;
+
}
@Override
@@ -97,4 +147,4 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empJobchangeMapper.logicDeleteByIds(list, operatorId);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0