From e0ffc505cf4f1bd6a945cf2e2bc7944459a3d2cd Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 18 二月 2021 04:57:08 +0800
Subject: [PATCH] 附件管理-标签管理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 9e13191..cbdddc2 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]);
@@ -95,6 +95,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);
//设置部门
--
Gitblit v1.8.0