From e15b6fa57d933172fd3091296042f114986dc6ab Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期二, 23 二月 2021 00:15:24 +0800
Subject: [PATCH] 修复主要工作内容无法模糊查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.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/EmpJobChangeServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
index bdffe36..e20c627 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
@@ -2,8 +2,11 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
+
+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,24 @@
public IPage<EmpJobChange> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange) {
LambdaQueryWrapper<EmpJobChange> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpJobChange::getDelFlag, 0);
+// if (StringUtils.isNotBlank(empJobchange.getEmpNumb())) {
+// queryWrapper.like(EmpJobChange::getEmpNumb, empJobchange.getEmpNumb());
+// }
+ if (StringUtils.isNotBlank(empJobchange.getEmpName())) {
+ queryWrapper.like(EmpJobChange::getEmpName, empJobchange.getEmpName());
+ }
+// if (StringUtils.isNotBlank(empJobchange.getCertificateNumb())) {
+// queryWrapper.like(EmpJobChange::getCertificateNumb, empJobchange.getCertificateNumb());
+// }
+// if (StringUtils.isNotBlank(empJobchange.getDeptName())) {
+// queryWrapper.like(EmpJobChange::getDeptName, empJobchange.getDeptName());
+// }
+ if (StringUtils.isNotBlank(empJobchange.getChangeDateStr())) {
+ queryWrapper.between(EmpJobChange::getChangeDate, empJobchange.getChangeDateStr().split(",")[0], empJobchange.getChangeDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empJobchange.getChangeType())) {
+ queryWrapper.eq(EmpJobChange::getChangeType, empJobchange.getChangeType());
+ }
Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
--
Gitblit v1.8.0