From 9bc6b681dd59e1aa6358d136d6f63a2477b0a49a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 21 二月 2021 13:17:17 +0800
Subject: [PATCH] fix(在职员工): 关闭档案
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 891794a..6cf699e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.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.EmpUnemployment;
-import cc.mrbird.febs.server.hr.mapper.EmpUnemploymentMapper;
-import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
+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.EmpUnemployment;
+import cc.mrbird.febs.server.hr.mapper.EmpUnemploymentMapper;
+import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
+import lombok.RequiredArgsConstructor;
/**
* name:EmpUnemployment
@@ -40,7 +47,25 @@
@Override
public IPage<EmpUnemployment> findEmpUnemployments(QueryRequest request, EmpUnemployment empUnemployment) {
LambdaQueryWrapper<EmpUnemployment> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpUnemployment::getDelFlag, 0);
+ queryWrapper.eq(EmpUnemployment::getDelFlag, empUnemployment.getDelFlag());
+ if (StringUtils.isNotBlank(empUnemployment.getEmpNumb())) {
+ queryWrapper.like(EmpUnemployment::getEmpNumb, empUnemployment.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empUnemployment.getEmpName())) {
+ queryWrapper.like(EmpUnemployment::getEmpName, empUnemployment.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empUnemployment.getCertificateNumb())) {
+ queryWrapper.like(EmpUnemployment::getCertificateNumb, empUnemployment.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empUnemployment.getDeptName())) {
+ queryWrapper.like(EmpUnemployment::getDeptName, empUnemployment.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empUnemployment.getApplayDateStr())) {
+ queryWrapper.between(EmpUnemployment::getApplayDate, empUnemployment.getApplayDateStr().split(",")[0], empUnemployment.getApplayDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empUnemployment.getApplayReason())) {
+ queryWrapper.like(EmpUnemployment::getApplayReason, empUnemployment.getApplayReason());
+ }
Page<EmpUnemployment> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +73,7 @@
@Override
public List<EmpUnemployment> findEmpUnemployments(EmpUnemployment empUnemployment) {
LambdaQueryWrapper<EmpUnemployment> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpUnemployment::getDelFlag, 0);
+ queryWrapper.eq(EmpUnemployment::getDelFlag, empUnemployment.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +122,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empUnemploymentMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empUnemploymentMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0