From d81fca8baf1b14bfe372cb1e3d85c0afa7350db7 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 04 三月 2021 02:11:56 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 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..99a044b 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
@@ -6,6 +6,7 @@
import cc.mrbird.febs.server.hr.mapper.EmpDimissionLogMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -41,32 +42,22 @@
.orElse("1");
@Override
- 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());
-// }
+ public IPage<Map<String, Object>> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog) {
+ QueryWrapper<EmpDimissionLog> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag", 0);
+
if (StringUtils.isNotBlank(empDimissionlog.getEntryDateStr())) {
- queryWrapper.between(EmpDimissionLog::getEntryDate, empDimissionlog.getEntryDateStr().split(",")[0], empDimissionlog.getEntryDateStr().split(",")[1]);
+ queryWrapper.between("a.entryDate", 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]);
+ queryWrapper.between("a.dimissionDate", empDimissionlog.getDimissionDateStr().split(",")[0], empDimissionlog.getDimissionDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
- queryWrapper.eq(EmpDimissionLog::getDimissionType, empDimissionlog.getDimissionType());
+ queryWrapper.eq("a.dimissionType", 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 +112,4 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empDimissionlogMapper.logicDeleteByIds(list, operatorId);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0