From 8bb9cf4117634383f45bc8e2be5c92993e5ef0b6 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期六, 20 二月 2021 12:01:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 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 9ed37a4..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
@@ -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.EmpPhysicalExam;
-import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
-import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
+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.EmpPhysicalExam;
+import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
+import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
+import lombok.RequiredArgsConstructor;
/**
* name:EmpPhysicalexam
@@ -41,6 +48,33 @@
public IPage<EmpPhysicalExam> findEmpPhysicalExams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpPhysicalExam::getDelFlag, empPhysicalexam.getDelFlag());
+ if (StringUtils.isNotBlank(empPhysicalexam.getEmpNumb())) {
+ queryWrapper.like(EmpPhysicalExam::getEmpNumb, empPhysicalexam.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getEmpName())) {
+ queryWrapper.like(EmpPhysicalExam::getEmpName, empPhysicalexam.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empPhysicalexam.getCertificateNumb())) {
+ queryWrapper.like(EmpPhysicalExam::getCertificateNumb, empPhysicalexam.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(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]);
+ }
+ 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());
+ }
Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
--
Gitblit v1.8.0