From bedc1792239e77a46936bf9b175e324d57113bfe Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 20 二月 2021 06:13:50 +0800
Subject: [PATCH] Merge branch 'lybDevelop'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
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 32f9804..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
@@ -49,16 +49,16 @@
LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpPhysicalExam::getDelFlag, empPhysicalexam.getDelFlag());
if (StringUtils.isNotBlank(empPhysicalexam.getEmpNumb())) {
- queryWrapper.eq(EmpPhysicalExam::getEmpNumb, empPhysicalexam.getEmpNumb());
+ queryWrapper.like(EmpPhysicalExam::getEmpNumb, empPhysicalexam.getEmpNumb());
}
if (StringUtils.isNotBlank(empPhysicalexam.getEmpName())) {
- queryWrapper.eq(EmpPhysicalExam::getEmpName, empPhysicalexam.getEmpName());
+ queryWrapper.like(EmpPhysicalExam::getEmpName, empPhysicalexam.getEmpName());
}
if (StringUtils.isNotBlank(empPhysicalexam.getCertificateNumb())) {
- queryWrapper.eq(EmpPhysicalExam::getCertificateNumb, empPhysicalexam.getCertificateNumb());
+ queryWrapper.like(EmpPhysicalExam::getCertificateNumb, empPhysicalexam.getCertificateNumb());
}
if (StringUtils.isNotBlank(empPhysicalexam.getDeptName())) {
- queryWrapper.eq(EmpPhysicalExam::getDeptName, empPhysicalexam.getDeptName());
+ queryWrapper.like(EmpPhysicalExam::getDeptName, empPhysicalexam.getDeptName());
}
if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamDateStr())) {
queryWrapper.between(EmpPhysicalExam::getPhysicalExamDate, empPhysicalexam.getPhysicalExamDateStr().split(",")[0], empPhysicalexam.getPhysicalExamDateStr().split(",")[1]);
@@ -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());
}
--
Gitblit v1.8.0