From 511a66546a655c9e5b44317ca82ae60fe5f2bf0d Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 28 五月 2021 01:52:58 +0800
Subject: [PATCH] fix(人力微服务):
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 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 f876128..0aedc31 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
@@ -93,29 +93,16 @@
if (StrUtil.isNotBlank(vo.getEntryDate())) {
queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]);
}
- if (StrUtil.isNotBlank(vo.getAge())) {
- 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 (StringUtils.isNotBlank(vo.getAge())) {
+ String[] ages = vo.getAge().split(",");
+ Consumer<QueryWrapper<EmpAccessoryVO>> consumer = wrapper -> {
+ for (int i = 0; i < ages.length; i++) {
+ String ageBtn = ages[i];
+ wrapper.or().between("a.Age", ageBtn.split("-")[0], ageBtn.split("-")[1]);
+ }
+ };
+ queryWrapper.and(consumer);
}
if (StrUtil.isNotBlank(vo.getArchivesStatus())) {
queryWrapper.in("a.archivesStatus", vo.getArchivesStatus().split(","));
--
Gitblit v1.8.0