From 7231552281feb6051cbb1d4c17f0d17f4d8cd7e3 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期六, 20 二月 2021 00:56:00 +0800
Subject: [PATCH] 智搜查询调整
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java | 21 ++++++++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 3 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 3 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 7 ++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 3 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 6 +++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java | 3 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 3 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 24 ++++++++++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 6 +++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 3 +
11 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
index e9244da..f47e94c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
@@ -109,4 +109,10 @@
@FieldInfo(name = "entryDates", explain = "关闭档案人员入职日期")
@TableField(exist = false)
private String entryDates;
+
+ @TableField(exist = false)
+ private String entryDateStr= "";
+
+ @TableField(exist = false)
+ private String dimissionDateStr= "";
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
index 548221e..092d4fa 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
@@ -128,4 +128,7 @@
@FieldInfo(name = "oldJobNames", explain = "调岗人员原岗位")
@TableField(exist = false)
private String oldJobNames;
+
+ @TableField(exist = false)
+ private String changeDateStr= "";
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
index 1488921..f86fcb1 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -60,6 +60,9 @@
queryWrapper.between(EmpBadRecord::getBadDate, empBadrecord.getBadDateStr().split(",")[0],
empBadrecord.getBadDateStr().split(",")[1]);
}
+ if (StringUtils.isNotBlank(empBadrecord.getBadContent())) {
+ queryWrapper.like(EmpBadRecord::getBadContent, empBadrecord.getBadContent());
+ }
Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
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 c8760fe..eaf9cf4 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
@@ -2,8 +2,11 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+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 org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -41,6 +44,27 @@
public IPage<EmpDimissionLog> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog) {
LambdaQueryWrapper<EmpDimissionLog> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpDimissionLog::getDelFlag, 0);
+// if (StringUtils.isNotBlank(empDimissionlog.getEmpNumb())) {
+// queryWrapper.like(EmpDimissionLog::getEmpNumb, empDimissionlog.getEmpNumb());
+// }
+// if (StringUtils.isNotBlank(empDimissionlog.getEmpName())) {
+// queryWrapper.like(EmpDimissionLog::getEmpName, empDimissionlog.getEmpName());
+// }
+// if (StringUtils.isNotBlank(empDimissionlog.getCertificateNumb())) {
+// queryWrapper.like(EmpDimissionLog::getCertificateNumb, empDimissionlog.getCertificateNumb());
+// }
+// if (StringUtils.isNotBlank(empDimissionlog.getDeptName())) {
+// queryWrapper.like(EmpDimissionLog::getDeptName, empDimissionlog.getDeptName());
+// }
+ if (StringUtils.isNotBlank(empDimissionlog.getEntryDateStr())) {
+ queryWrapper.between(EmpDimissionLog::getEntryDate, empDimissionlog.getEntryDateStr().split(",")[0], empDimissionlog.getEntryDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getDimissionDateStr())) {
+ queryWrapper.between(EmpDimissionLog::getDimissionDate, empDimissionlog.getDimissionDateStr().split(",")[0], empDimissionlog.getDimissionDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
+ queryWrapper.eq(EmpDimissionLog::getDimissionType, empDimissionlog.getDimissionType());
+ }
Page<EmpDimissionLog> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
index bdffe36..e20c627 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
@@ -2,8 +2,11 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -41,6 +44,24 @@
public IPage<EmpJobChange> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange) {
LambdaQueryWrapper<EmpJobChange> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpJobChange::getDelFlag, 0);
+// if (StringUtils.isNotBlank(empJobchange.getEmpNumb())) {
+// queryWrapper.like(EmpJobChange::getEmpNumb, empJobchange.getEmpNumb());
+// }
+ if (StringUtils.isNotBlank(empJobchange.getEmpName())) {
+ queryWrapper.like(EmpJobChange::getEmpName, empJobchange.getEmpName());
+ }
+// if (StringUtils.isNotBlank(empJobchange.getCertificateNumb())) {
+// queryWrapper.like(EmpJobChange::getCertificateNumb, empJobchange.getCertificateNumb());
+// }
+// if (StringUtils.isNotBlank(empJobchange.getDeptName())) {
+// queryWrapper.like(EmpJobChange::getDeptName, empJobchange.getDeptName());
+// }
+ if (StringUtils.isNotBlank(empJobchange.getChangeDateStr())) {
+ queryWrapper.between(EmpJobChange::getChangeDate, empJobchange.getChangeDateStr().split(",")[0], empJobchange.getChangeDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empJobchange.getChangeType())) {
+ queryWrapper.eq(EmpJobChange::getChangeType, empJobchange.getChangeType());
+ }
Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index d37362f..ff3cbb7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -74,6 +74,9 @@
if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
queryWrapper.eq(EmpLaborTrouble::getEmpStatus, empLabortrouble.getEmpStatus());
}
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
+ queryWrapper.like(EmpLaborTrouble::getArbitrationReason, empLabortrouble.getArbitrationReason());
+ }
Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
index 23a034a..8b56666 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -66,6 +66,12 @@
if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamType())) {
queryWrapper.eq(EmpPhysicalExam::getPhysicalExamType, empPhysicalexam.getPhysicalExamType());
}
+ if (StringUtils.isNotBlank(empPhysicalexam.getEcg())) {
+ queryWrapper.eq(EmpPhysicalExam::getEcg, empPhysicalexam.getEcg());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getConclusion())) {
+ queryWrapper.like(EmpPhysicalExam::getConclusion, empPhysicalexam.getConclusion());
+ }
if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
queryWrapper.eq(EmpPhysicalExam::getEmpStatus, empPhysicalexam.getEmpStatus());
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index 715276c..dce0f6f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -60,6 +60,9 @@
queryWrapper.between(EmpRemarkInfo::getRemarkDate, empRemarkinfo.getRemarkDateStr().split(",")[0],
empRemarkinfo.getRemarkDateStr().split(",")[1]);
}
+ if (StringUtils.isNotBlank(empRemarkinfo.getRemarkContent())) {
+ queryWrapper.like(EmpRemarkInfo::getRemarkContent, empRemarkinfo.getRemarkContent());
+ }
Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index c22ceae..c50839a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -60,6 +60,9 @@
if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
queryWrapper.between(EmpResign::getApplayDate, empResign.getApplayDateStr().split(",")[0], empResign.getApplayDateStr().split(",")[1]);
}
+ if (StringUtils.isNotBlank(empResign.getReason())) {
+ queryWrapper.like(EmpResign::getReason, empResign.getReason());
+ }
return this.page(page, queryWrapper);
}
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 1cb38e6..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
@@ -63,6 +63,9 @@
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);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index f989db5..358b468 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -53,8 +53,11 @@
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
}
- if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
- queryWrapper.eq(EmpWorkExperience::getEmpStatus, empWorkexperience.getEmpStatus());
+ if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
+ queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
+ queryWrapper.eq(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
}
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
--
Gitblit v1.8.0