From be8f6f934191cfa787564d59fdd69810fad05cc5 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期六, 27 二月 2021 03:35:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
index c8760fe..eaf9cf4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
@@ -2,8 +2,11 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionLogMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -41,6 +44,27 @@
public IPage<EmpDimissionLog> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog) {
LambdaQueryWrapper<EmpDimissionLog> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpDimissionLog::getDelFlag, 0);
+// if (StringUtils.isNotBlank(empDimissionlog.getEmpNumb())) {
+// queryWrapper.like(EmpDimissionLog::getEmpNumb, empDimissionlog.getEmpNumb());
+// }
+// if (StringUtils.isNotBlank(empDimissionlog.getEmpName())) {
+// queryWrapper.like(EmpDimissionLog::getEmpName, empDimissionlog.getEmpName());
+// }
+// if (StringUtils.isNotBlank(empDimissionlog.getCertificateNumb())) {
+// queryWrapper.like(EmpDimissionLog::getCertificateNumb, empDimissionlog.getCertificateNumb());
+// }
+// if (StringUtils.isNotBlank(empDimissionlog.getDeptName())) {
+// queryWrapper.like(EmpDimissionLog::getDeptName, empDimissionlog.getDeptName());
+// }
+ if (StringUtils.isNotBlank(empDimissionlog.getEntryDateStr())) {
+ queryWrapper.between(EmpDimissionLog::getEntryDate, empDimissionlog.getEntryDateStr().split(",")[0], empDimissionlog.getEntryDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getDimissionDateStr())) {
+ queryWrapper.between(EmpDimissionLog::getDimissionDate, empDimissionlog.getDimissionDateStr().split(",")[0], empDimissionlog.getDimissionDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
+ queryWrapper.eq(EmpDimissionLog::getDimissionType, empDimissionlog.getDimissionType());
+ }
Page<EmpDimissionLog> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
--
Gitblit v1.8.0