From a7ca32e775e76b4e4667d9f9d76739a73fe68ba3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 二月 2021 23:22:49 +0800
Subject: [PATCH] feat(离职考勤实体类): 离职考勤月份修改成不在数据库中存在
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 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 452d945..b44966f 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
@@ -150,10 +150,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpBaseInfo(EmpBaseInfo empBaseInfo) {
- empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ EmpBaseInfo dbInfo = this.getEmpBaseInfo(empBaseInfo);
+ if(dbInfo==null) {
+ empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ } else{
+ empBaseInfo.setEmpId(dbInfo.getEmpId());
+ }
+ empBaseInfo.setEmpStatus("0");
empBaseInfo.setCreator(operatorId);
empBaseInfo.setModifier(operatorId);
- this.save(empBaseInfo);
+ this.saveOrUpdate(empBaseInfo);
}
@Override
@@ -232,4 +238,14 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empBaseInfoMapper.momentToNormal(list, operatorId) > 0;
}
+
+ @Override
+ public EmpBaseInfo getEmpBaseInfo(EmpBaseInfo empBaseInfo) {
+ QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotEmpty(empBaseInfo.getCertificateNumb())){
+ queryWrapper.lambda().eq(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
+ }
+
+ return this.getOne(queryWrapper);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0