From 7b720f18f1824a7c9882e2404087cbf3793914e3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 三月 2021 23:42:28 +0800
Subject: [PATCH] fix(bug修复): 在职员工信息录入时，同步增加一条入职记录
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 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 42ea780..fed7122 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
@@ -173,8 +173,11 @@
public void createEmpBaseInfo(EmpBaseInfo empBaseInfo) {
String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
EmpBaseInfo dbInfo = this.getEmpBaseInfo(empBaseInfo);
- if (dbInfo == null) {
- empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ Long empId = SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE);
+ boolean saveDimissionLog = false;
+ if (dbInfo == null) {
+ empBaseInfo.setEmpId(empId);
+ saveDimissionLog = true;
} else {
empBaseInfo.setEmpId(dbInfo.getEmpId());
}
@@ -188,6 +191,19 @@
empBaseInfo.setCreator(operatorId);
empBaseInfo.setModifier(operatorId);
this.saveOrUpdate(empBaseInfo);
+
+ if(saveDimissionLog) {
+ EmpDimissionLog dimissionLog = new EmpDimissionLog();
+ dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ dimissionLog.setEmpId(empId);
+ dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
+ dimissionLog.setDimissionType("20");
+ dimissionLog.setRemark(empBaseInfo.getRemark());
+ dimissionLog.setCreator(operatorId);
+ dimissionLog.setModifier(operatorId);
+
+ dimissionLogService.save(dimissionLog);
+ }
}
@Override
@@ -1117,6 +1133,7 @@
public EmpBaseInfo addInEmpBaseInfo(EmpBaseInfo empBaseInfo) {
EmpBaseInfo dbEmpInfo = this.getEmpBaseInfo(empBaseInfo);
if (dbEmpInfo == null) {
+ empBaseInfo.setDelFlag(0);
this.createEmpBaseInfo(empBaseInfo);
return null;
} else {
--
Gitblit v1.8.0