From f0d3fc365295e8a8cb8a0f7a3e7bc248d1e969c3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 20 二月 2021 23:14:34 +0800
Subject: [PATCH] feat(信息录入): 合同信息
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
index 45bbdee..bd375a5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
@@ -1,9 +1,13 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -40,7 +44,31 @@
@Override
public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpDimissionAttend::getDelFlag, 0);
+ queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
+ if (StringUtils.isNotBlank(empDimissionattend.getEmpNumb())) {
+ queryWrapper.like(EmpDimissionAttend::getEmpNumb, empDimissionattend.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getEmpName())) {
+ queryWrapper.like(EmpDimissionAttend::getEmpName, empDimissionattend.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getCertificateNumb())) {
+ queryWrapper.like(EmpDimissionAttend::getCertificateNumb, empDimissionattend.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getDeptName())) {
+ queryWrapper.like(EmpDimissionAttend::getDeptName, empDimissionattend.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getAttendYear())) {
+ queryWrapper.like(EmpDimissionAttend::getAttendYear, empDimissionattend.getAttendYear());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getAttendMonth())) {
+ queryWrapper.like(EmpDimissionAttend::getAttendMonth, empDimissionattend.getAttendMonth());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getDeductStr())) {
+ queryWrapper.like(EmpDimissionAttend::getDeduct, empDimissionattend.getDeductStr());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
+ queryWrapper.eq(EmpDimissionAttend::getEmpStatus, empDimissionattend.getEmpStatus());
+ }
Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +76,7 @@
@Override
public List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpDimissionAttend::getDelFlag, 0);
+ queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +125,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empDimissionattendMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empDimissionattendMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0