From b230858cc0d2ee4fdb177c91c4e11cdf3dd57364 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 二月 2021 07:15:33 +0800
Subject: [PATCH] Merge branch 'lybDevelop'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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..0e82aed 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
@@ -57,16 +57,16 @@
LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
if (StringUtils.isNotBlank(empBaseInfo.getEmpNumb())) {
- queryWrapper.eq(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb());
+ queryWrapper.like(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb());
}
if (StringUtils.isNotBlank(empBaseInfo.getEmpName())) {
- queryWrapper.eq(EmpBaseInfo::getEmpName, empBaseInfo.getEmpName());
+ queryWrapper.like(EmpBaseInfo::getEmpName, empBaseInfo.getEmpName());
}
if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
- queryWrapper.eq(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
+ queryWrapper.like(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empBaseInfo.getDeptName())) {
- queryWrapper.eq(EmpBaseInfo::getDeptName, empBaseInfo.getDeptName());
+ queryWrapper.like(EmpBaseInfo::getDeptName, empBaseInfo.getDeptName());
}
if (StringUtils.isNotBlank(empBaseInfo.getEntryDateStr())) {
queryWrapper.between(EmpBaseInfo::getEntryDate, empBaseInfo.getEntryDateStr().split(",")[0], empBaseInfo.getEntryDateStr().split(",")[1]);
@@ -78,10 +78,10 @@
queryWrapper.eq(EmpBaseInfo::getSex, empBaseInfo.getSex());
}
if (StringUtils.isNotBlank(empBaseInfo.getEducation())) {
- queryWrapper.eq(EmpBaseInfo::getEducation, empBaseInfo.getEducation());
+ queryWrapper.like(EmpBaseInfo::getEducation, empBaseInfo.getEducation());
}
if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
- queryWrapper.eq(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics());
+ queryWrapper.like(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics());
}
if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
queryWrapper.between(EmpBaseInfo::getAge, empBaseInfo.getAgeStr().split(",")[0], empBaseInfo.getAgeStr().split(",")[1]);
@@ -94,6 +94,12 @@
}
if (StringUtils.isNotBlank(empBaseInfo.getEmpStatus())) {
queryWrapper.eq(EmpBaseInfo::getEmpStatus, empBaseInfo.getEmpStatus());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getHandbookStatus())) {
+ queryWrapper.eq(EmpBaseInfo::getHandbookStatus, empBaseInfo.getHandbookStatus());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
+ queryWrapper.eq(EmpBaseInfo::getEmpCardStatus, empBaseInfo.getEmpCardStatus());
}
Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<EmpBaseInfo> iPage = this.page(page, queryWrapper);
@@ -150,10 +156,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 +244,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