From db6a13645ba212dee0ef46548cc3468d30b76873 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 24 五月 2021 21:29:05 +0800
Subject: [PATCH] feat(定时更新基本信息表的部门名称与全称):
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 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 508fc40..d46cf7a 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
@@ -1,28 +1,26 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
-import cc.mrbird.febs.common.core.utils.SortUtil;
-import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
-import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
-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 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;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.core.utils.SortUtil;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
+import cc.mrbird.febs.server.hr.mapper.EmpDimissionLogMapper;
+import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -60,13 +58,20 @@
if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
queryWrapper.eq("a.dimissionType", empDimissionlog.getDimissionType());
}
- if (empDimissionlog.getEmpId()!=null) {
+ if (null!=empDimissionlog.getEmpId()&&!empDimissionlog.getEmpId().equals(0L)) {
queryWrapper.eq("a.empId", empDimissionlog.getEmpId());
}
if (StringUtils.isNotBlank(empDimissionlog.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empDimissionlog.getEmpStatus().split(","));
- } else {
- queryWrapper.in("b.EmpStatus", 0);
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getDeptName())) {
+ queryWrapper.like("c.allDeptName", empDimissionlog.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getEmpName())) {
+ queryWrapper.like("b.empName", empDimissionlog.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getEmpNumb())) {
+ queryWrapper.like("b.empNumb", empDimissionlog.getEmpNumb());
}
Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());
SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
--
Gitblit v1.8.0