From fd59acfd5f323839b7d7c8f578cf8b996862ebb5 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 03 三月 2021 00:30:00 +0800
Subject: [PATCH] feat(在职员工): 增加员工
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 3cdd4fc..e7ed572 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -11,6 +11,7 @@
import cc.mrbird.febs.common.core.utils.MyUtil;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
@@ -61,7 +62,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpBaseInfoServiceImpl extends ServiceImpl<EmpBaseInfoMapper, EmpBaseInfo> implements IEmpBaseInfoService {
private final RedisService redisService;
- private final IRemoteDeptService remoteDeptService;
+ private final IRemoteUserService iRemoteUserService;
private final EmpBaseInfoMapper empBaseInfoMapper;
private final IEmpDimissionLogService dimissionLogService;
private final IEmpJobChangeService jobChangeService;
@@ -85,6 +86,8 @@
list.forEach(p -> {
p.setSexName("1".equals(p.getSex()) ? "男" : "女");
p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交");
+ p.setEmpCardStatusName("1".equals(p.getEmpCardStatus()) ? "未发" : "已发");
+ p.setHandbookStatusName("1".equals(p.getHandbookStatus()) ? "未发" : "已发");
//保险类型
p.setInsuranceTypeName(dicItems.stream()
.filter(k -> DicCode.INSURANCETYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getInsuranceType()))
@@ -280,9 +283,11 @@
dimissionLog.setReporter(empDimissionLog.getReporter());
dimissionLog.setCreator(operatorId);
dimissionLog.setModifier(operatorId);
-
dimissionLogService.save(dimissionLog);
}
+ EmpBaseInfo empBaseInfo = this.getById(dimissionLog.getEmpId());
+ //禁用账户
+ iRemoteUserService.updateStatus(empBaseInfo.getCertificateNumb());
return empBaseInfoMapper.closeEmpArchives(list, empDimissionLog.getDimissionType(), empDimissionLog.getDimissionDate(), empDimissionLog.getRemark(), operatorId) > 0;
}
@@ -848,8 +853,25 @@
if (StringUtils.isNotBlank(empBaseInfo.getInsuranceType())) {
p.or().in(EmpBaseInfo::getInsuranceType, empBaseInfo.getInsuranceType().split(","));
}
+ if (StringUtils.isNotBlank(empBaseInfo.getHandbookStatus())) {
+ p.or().in(EmpBaseInfo::getHandbookStatus, empBaseInfo.getHandbookStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
+ p.or().in(EmpBaseInfo::getEmpCardStatus, empBaseInfo.getEmpCardStatus().split(","));
+ }
});
}
return queryWrapper;
}
+
+ @Override
+ public EmpBaseInfo addInEmpBaseInfo(EmpBaseInfo empBaseInfo) {
+ EmpBaseInfo dbEmpInfo = this.getEmpBaseInfo(empBaseInfo);
+ if(dbEmpInfo==null){
+ this.createEmpBaseInfo(empBaseInfo);
+ return null;
+ } else {
+ return dbEmpInfo;
+ }
+ }
}
--
Gitblit v1.8.0