From 1f8196dae2aeabdefce2ff82ee4cd86706b5c48b Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期一, 22 二月 2021 15:24:57 +0800
Subject: [PATCH] 修改导出bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
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 9b985dd..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
@@ -2,8 +2,11 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
+import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
+
+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,25 @@
public IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
+ if (StringUtils.isNotBlank(empRemarkinfo.getEmpNumb())) {
+ queryWrapper.like(EmpRemarkInfo::getEmpNumb, empRemarkinfo.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empRemarkinfo.getEmpName())) {
+ queryWrapper.like(EmpRemarkInfo::getEmpName, empRemarkinfo.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empRemarkinfo.getCertificateNumb())) {
+ queryWrapper.like(EmpRemarkInfo::getCertificateNumb, empRemarkinfo.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
+ queryWrapper.like(EmpRemarkInfo::getDeptName, empRemarkinfo.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empRemarkinfo.getRemarkDateStr())) {
+ 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);
}
--
Gitblit v1.8.0