From 7231552281feb6051cbb1d4c17f0d17f4d8cd7e3 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期六, 20 二月 2021 00:56:00 +0800
Subject: [PATCH] 智搜查询调整
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index ec37857..358b468 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -3,9 +3,12 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -40,7 +43,22 @@
@Override
public IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience) {
LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpWorkExperience::getDelFlag, 0);
+ queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
+ if (StringUtils.isNotBlank(empWorkexperience.getEmpNumb())) {
+ queryWrapper.like(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getEmpName())) {
+ queryWrapper.like(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
+ queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
+ queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
+ queryWrapper.eq(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
+ }
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +66,7 @@
@Override
public List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpWorkExperience::getDelFlag, 0);
+ queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -100,4 +118,11 @@
list.addAll(Arrays.asList(str));
empWorkexperienceMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empWorkexperienceMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0