From ecad6bdfc3a547d8aa4ae80aec4f060c10e442e0 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 17:05:31 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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..eab9801 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
@@ -4,6 +4,9 @@
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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -38,11 +41,29 @@
.orElse("1");
@Override
- public IPage<EmpJobChange> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange) {
- LambdaQueryWrapper<EmpJobChange> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpJobChange::getDelFlag, 0);
+ public IPage<Map<String,Object>> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange) {
+ QueryWrapper<EmpJobChange> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag", 0);
+ if (StringUtils.isNotBlank(empJobchange.getEmpNumb())) {
+ queryWrapper.like("b.empNumb", empJobchange.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getEmpName())) {
+ queryWrapper.like("a.empName", empJobchange.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getCertificateNumb())) {
+ queryWrapper.like("b.certificateNumb", empJobchange.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getDeptName())) {
+ queryWrapper.like("a.newDeptName", empJobchange.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getChangeDateStr())) {
+ queryWrapper.between("a.changeDate", empJobchange.getChangeDateStr().split(",")[0], empJobchange.getChangeDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empJobchange.getChangeType())) {
+ queryWrapper.eq("a.changeType", empJobchange.getChangeType());
+ }
Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ return this.baseMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -97,4 +118,4 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empJobchangeMapper.logicDeleteByIds(list, operatorId);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0