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/EmpResignServiceImpl.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/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index ce302be..c22ceae 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -2,8 +2,11 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpResign;
+import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -40,15 +43,30 @@
@Override
public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, 0);
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
+ if (StringUtils.isNotBlank(empResign.getEmpNumb())) {
+ queryWrapper.like(EmpResign::getEmpNumb, empResign.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empResign.getEmpName())) {
+ queryWrapper.like(EmpResign::getEmpName, empResign.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empResign.getCertificateNumb())) {
+ queryWrapper.like(EmpResign::getCertificateNumb, empResign.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empResign.getDeptName())) {
+ queryWrapper.like(EmpResign::getDeptName, empResign.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
+ queryWrapper.between(EmpResign::getApplayDate, empResign.getApplayDateStr().split(",")[0], empResign.getApplayDateStr().split(",")[1]);
+ }
return this.page(page, queryWrapper);
}
@Override
public List<EmpResign> findEmpResigns(EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, 0);
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +115,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empResignMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empResignMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0