From e0de659f8545acb72a4a418beed2d74133a76f04 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 21 二月 2021 13:30:16 +0800
Subject: [PATCH] fix(在职员工): 员工调岗
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index bff6335..0e59cd7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -6,6 +6,11 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.constant.DicCode;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.utils.CastUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -40,6 +45,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpContractInfoServiceImpl extends ServiceImpl<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {
+ private final RedisService redisService;
private final EmpContractInfoMapper empContractinfoMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -50,31 +56,43 @@
LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
if (StringUtils.isNotBlank(empContractinfo.getEmpNumb())) {
- queryWrapper.eq(EmpContractInfo::getEmpNumb, empContractinfo.getEmpNumb());
+ queryWrapper.like(EmpContractInfo::getEmpNumb, empContractinfo.getEmpNumb());
}
if (StringUtils.isNotBlank(empContractinfo.getEmpName())) {
- queryWrapper.eq(EmpContractInfo::getEmpName, empContractinfo.getEmpName());
+ queryWrapper.like(EmpContractInfo::getEmpName, empContractinfo.getEmpName());
}
if (StringUtils.isNotBlank(empContractinfo.getCertificateNumb())) {
- queryWrapper.eq(EmpContractInfo::getCertificateNumb, empContractinfo.getCertificateNumb());
+ queryWrapper.like(EmpContractInfo::getCertificateNumb, empContractinfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
- queryWrapper.eq(EmpContractInfo::getDeptName, empContractinfo.getDeptName());
+ queryWrapper.like(EmpContractInfo::getDeptName, empContractinfo.getDeptName());
}
if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
- queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
+ queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
- queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
+ queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
- queryWrapper.eq(EmpContractInfo::getEmpStatus, empContractinfo.getEmpStatus());
+ queryWrapper.like(EmpContractInfo::getEmpStatus, empContractinfo.getEmpStatus());
}
if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
queryWrapper.eq(EmpContractInfo::getContractStatus, empContractinfo.getContractStatus());
}
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ IPage<EmpContractInfo> iPage = this.page(page, queryWrapper);
+ List<EmpContractInfo> list = iPage.getRecords();
+ //设置字典数据
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setContractStatusName(dicItems.stream()
+ .filter(k -> DicCode.CONTRACTSTATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getContractStatus()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("新签"));
+ });
+ iPage.setRecords(list);
+ return iPage;
}
@Override
@@ -88,7 +106,7 @@
@Transactional(rollbackFor = Exception.class)
public void createEmpContractinfo(EmpContractInfo empContractinfo) {
empContractinfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- if(empContractinfo.getBeginDate()==null){
+ if (empContractinfo.getBeginDate() == null) {
empContractinfo.setBeginDate(empContractinfo.getSigningDate());
}
empContractinfo.setCreator(operatorId);
@@ -137,6 +155,6 @@
public boolean momentToNormal(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- return empContractinfoMapper.momentToNormal(list, operatorId)>0;
+ return empContractinfoMapper.momentToNormal(list, operatorId) > 0;
}
}
\ No newline at end of file
--
Gitblit v1.8.0