From 0ba51b87c662a28778fbe25bf804aa9ea85c802e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 03 三月 2021 02:23:29 +0800
Subject: [PATCH] feat(在职员工): 关闭档案
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 75 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index c5da938..eb6eb1b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -21,6 +21,7 @@
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.aspectj.weaver.ast.Or;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -62,63 +63,72 @@
@Override
public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
- QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ if (StrUtil.isNotBlank(vo.getBasic())) {
+ queryWrapper.like("a.empNumb", vo.getBasic()).or().like("a.deptName", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.jobName", vo.getBasic());
+ }
if (StrUtil.isNotBlank(vo.getEmpName())) {
- queryWrapper.like("a.empName", vo.getEmpName());
+ queryWrapper.like("a.empName", vo.getEmpName().split(","));
}
if (StrUtil.isNotBlank(vo.getEmpNumb())) {
- queryWrapper.like("a.empNumb", vo.getEmpNumb());
+ queryWrapper.like("a.empNumb", vo.getEmpNumb().split(","));
}
if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
- queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
+ queryWrapper.like("a.certificateNumb", vo.getCertificateNumb().split(","));
}
if (StrUtil.isNotBlank(vo.getDeptName())) {
- queryWrapper.like("a.deptName", vo.getDeptName());
+ queryWrapper.like("a.deptName", vo.getDeptName().split(","));
}
if (StrUtil.isNotBlank(vo.getEntryDate())) {
queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]);
}
if (StrUtil.isNotBlank(vo.getAge())) {
- if (StrUtil.equals(vo.getAge(), "1")) {
- queryWrapper.between("a.age", 18, 29);
- } else if (StrUtil.equals(vo.getAge(), "2")) {
- queryWrapper.between("a.age", 30, 39);
- } else if (StrUtil.equals(vo.getAge(), "3")) {
- queryWrapper.between("a.age", 40, 49);
- } else if (StrUtil.equals(vo.getAge(), "4")) {
- queryWrapper.between("a.age", 50, 59);
- } else if (StrUtil.equals(vo.getAge(), "5")) {
- queryWrapper.between("a.age", 60, 69);
- } else if (StrUtil.equals(vo.getAge(), "6")) {
- queryWrapper.ge("a.age", 69);
+ String[] arr = vo.getAge().split(",");
+ for (String s : arr) {
+ if (StrUtil.equals(s, "18-29")) {
+ queryWrapper.or().between("a.age", 18, 29);
+ }
+ if (StrUtil.equals(s, "30-39")) {
+ queryWrapper.or().between("a.age", 30, 39);
+ }
+ if (StrUtil.equals(s, "40-49")) {
+ queryWrapper.or().between("a.age", 40, 49);
+ }
+ if (StrUtil.equals(s, "50-59")) {
+ queryWrapper.or().between("a.age", 50, 59);
+ }
+ if (StrUtil.equals(s, "60-69")) {
+ queryWrapper.or().between("a.age", 60, 69);
+ }
+ if (StrUtil.equals(s, "69-999")) {
+ queryWrapper.or().ge("a.age", 69);
+ }
}
+
}
if (StrUtil.isNotBlank(vo.getArchivesStatus())) {
- if (!StrUtil.equals(vo.getArchivesStatus(), "-1")) {
- queryWrapper.eq("a.archivesStatus", vo.getArchivesStatus());
- }
+ queryWrapper.in("a.archivesStatus", vo.getArchivesStatus().split(","));
}
if (StrUtil.isNotBlank(vo.getEducation())) {
- if (!StrUtil.equals(vo.getEducation(), "-1")) {
- queryWrapper.eq("a.education", vo.getEducation());
- }
+ queryWrapper.in("a.education", vo.getEducation().split(","));
}
if (StrUtil.isNotBlank(vo.getSex())) {
- if (!StrUtil.equals(vo.getSex(), "-1")) {
- queryWrapper.eq("a.sex", vo.getSex());
- }
+ queryWrapper.in("a.sex", vo.getSex().split(","));
}
if (StrUtil.isNotBlank(vo.getInsuranceType())) {
- if (!StrUtil.equals(vo.getInsuranceType(), "-1")) {
- queryWrapper.eq("a.insuranceType", vo.getInsuranceType());
- }
+ queryWrapper.in("a.insuranceType", vo.getInsuranceType().split(","));
}
if (StrUtil.isNotBlank(vo.getPolitics())) {
- if (!StrUtil.equals(vo.getPolitics(), "-1")) {
- queryWrapper.eq("a.politics", vo.getPolitics());
- }
+ queryWrapper.in("a.politics", vo.getPolitics().split(","));
+ }
+ if (StrUtil.isNotBlank(vo.getEmpStatus())) {
+ queryWrapper.in("a.empStatus", vo.getEmpStatus().split(","));
+ }
+ if (StrUtil.isNotBlank(vo.getPolitics())) {
+ queryWrapper.in("a.politics", vo.getPolitics().split(","));
}
queryWrapper.eq("a.delFlag", 0);
+ queryWrapper.orderByAsc("a.deptName,a.empName,a.certificateNumb");
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
String querySql = empAccessoryMapper.getQuerySql();
IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
@@ -210,7 +220,6 @@
@Override
public void mvFiles(String accessoryids,Long labelid,Long empId) {
String[] arr = accessoryids.split(",");
-
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid, arr);
wapper.set(EmpAccessory::getModifier,operatorId);
--
Gitblit v1.8.0