From d48f137e71193bd8b3bb39570eca666798fda070 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 19 二月 2021 20:37:03 +0800
Subject: [PATCH] feat(分支合并): 附件管理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index fbc23d5..6bf816c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -1,22 +1,30 @@
package cc.mrbird.febs.server.hr.service.impl;
-import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
-import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
-import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
+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.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
+import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
+import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
+import lombok.RequiredArgsConstructor;
/**
* name:EmpContractinfo
@@ -41,6 +49,30 @@
public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
+ if (StringUtils.isNotBlank(empContractinfo.getEmpNumb())) {
+ queryWrapper.like(EmpContractInfo::getEmpNumb, empContractinfo.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getEmpName())) {
+ queryWrapper.like(EmpContractInfo::getEmpName, empContractinfo.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getCertificateNumb())) {
+ queryWrapper.like(EmpContractInfo::getCertificateNumb, empContractinfo.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
+ queryWrapper.like(EmpContractInfo::getDeptName, empContractinfo.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
+ queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
+ queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
+ queryWrapper.like(EmpContractInfo::getEmpStatus, empContractinfo.getEmpStatus());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
+ queryWrapper.eq(EmpContractInfo::getContractStatus, empContractinfo.getContractStatus());
+ }
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
--
Gitblit v1.8.0