From e0de659f8545acb72a4a418beed2d74133a76f04 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 21 二月 2021 13:30:16 +0800
Subject: [PATCH] fix(在职员工): 员工调岗

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 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 2de822a..c50839a 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;
@@ -42,6 +45,24 @@
         LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
         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]);
+        }
+        if (StringUtils.isNotBlank(empResign.getReason())) {
+            queryWrapper.like(EmpResign::getReason, empResign.getReason());
+        }
         return this.page(page, queryWrapper);
     }
 

--
Gitblit v1.8.0