From 341147c079523c492749f48431d16fc9d6313535 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:44:20 +0800
Subject: [PATCH] 提交调岗查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 870adfb..c14918c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -1,22 +1,29 @@
package cc.mrbird.febs.server.hr.service.impl;
-import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
-import cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper;
-import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+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 org.springframework.transaction.annotation.Transactional;
+
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.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
-
-import java.util.*;
+import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
+import cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper;
+import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
+import lombok.RequiredArgsConstructor;
/**
* name:EmpLeaveinfo
@@ -38,17 +45,36 @@
.orElse("1");
@Override
- public IPage<EmpLeaveInfo> findEmpLeaveinfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
+ public IPage<EmpLeaveInfo> findEmpLeaveInfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpLeaveInfo::getDelFlag, empLeaveinfo.getDelFlag());
+ if (StringUtils.isNotBlank(empLeaveinfo.getEmpNumb())) {
+ queryWrapper.like(EmpLeaveInfo::getEmpNumb, empLeaveinfo.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getEmpName())) {
+ queryWrapper.like(EmpLeaveInfo::getEmpName, empLeaveinfo.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getCertificateNumb())) {
+ queryWrapper.like(EmpLeaveInfo::getCertificateNumb, empLeaveinfo.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getDeptName())) {
+ queryWrapper.like(EmpLeaveInfo::getDeptName, empLeaveinfo.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
+ queryWrapper.eq(EmpLeaveInfo::getEmpStatus, empLeaveinfo.getEmpStatus());
+ }
+ if (StringUtils.isNotBlank(empLeaveinfo.getLeaveDateStr())) {
+ queryWrapper.ge(EmpLeaveInfo::getBeginTime, empLeaveinfo.getLeaveDateStr().split(",")[0]);
+ queryWrapper.le(EmpLeaveInfo::getEndTime, empLeaveinfo.getLeaveDateStr().split(",")[1]);
+ }
Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@Override
- public List<EmpLeaveInfo> findEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
+ public List<EmpLeaveInfo> findEmpLeaveInfos(EmpLeaveInfo empLeaveinfo) {
LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpLeaveInfo::getDelFlag, empLeaveinfo.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +123,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empLeaveinfoMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empLeaveinfoMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0