From 455bf65a36ce1e9b6c24eb5c86a8eb69eaea8003 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期四, 04 三月 2021 00:19:47 +0800
Subject: [PATCH] 增加员工基本信息，工作经历的关联查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 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 eaf9cf4..d32753b 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
@@ -41,21 +41,10 @@
.orElse("1");
@Override
- public IPage<EmpDimissionLog> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog) {
+ public IPage<Map<String, Object>> 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]);
}
@@ -65,8 +54,9 @@
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);
+ Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());
+
+ return this.baseMapper.selectPageVo(page,queryWrapper);
}
@Override
@@ -121,4 +111,4 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empDimissionlogMapper.logicDeleteByIds(list, operatorId);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0