From 9bc6b681dd59e1aa6358d136d6f63a2477b0a49a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 21 二月 2021 13:17:17 +0800
Subject: [PATCH] fix(在职员工): 关闭档案
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 83 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 27 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
index 9a462a9..f86fcb1 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -1,12 +1,12 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -16,6 +16,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.*;
@@ -25,13 +27,13 @@
* description:员工不良记录信息服务接口实现
*
* @author luoyibo
- * @date 2021-01-24 20:35:55
+ * @date 2021-01-31 11:26:42
* @since JDK1.8
*/
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
+class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
private final EmpBadRecordMapper empBadrecordMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
@@ -39,25 +41,42 @@
.orElse("1");
@Override
- public IPage<EmpBadRecord> findEmpBadRecords(QueryRequest request, EmpBadRecord empBadrecord) {
+ public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpBadRecord::getDelFlag, 0);
-
+ queryWrapper.eq(EmpBadRecord::getDelFlag, empBadrecord.getDelFlag());
+ if (StringUtils.isNotBlank(empBadrecord.getEmpNumb())) {
+ queryWrapper.like(EmpBadRecord::getEmpNumb, empBadrecord.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getEmpName())) {
+ queryWrapper.like(EmpBadRecord::getEmpName, empBadrecord.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getCertificateNumb())) {
+ queryWrapper.like(EmpBadRecord::getCertificateNumb, empBadrecord.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
+ queryWrapper.like(EmpBadRecord::getDeptName, empBadrecord.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
+ queryWrapper.between(EmpBadRecord::getBadDate, empBadrecord.getBadDateStr().split(",")[0],
+ empBadrecord.getBadDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getBadContent())) {
+ queryWrapper.like(EmpBadRecord::getBadContent, empBadrecord.getBadContent());
+ }
Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@Override
- public List<EmpBadRecord> findEmpBadRecords(EmpBadRecord empBadrecord) {
+ public List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord) {
LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpBadRecord::getDelFlag, 0);
-
+ queryWrapper.eq(EmpBadRecord::getDelFlag, empBadrecord.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpBadRecord(EmpBadRecord empBadrecord) {
+ public void createEmpBadrecord(EmpBadRecord empBadrecord) {
empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empBadrecord.setCreator(operatorId);
empBadrecord.setModifier(operatorId);
@@ -66,35 +85,45 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpBadRecord(EmpBadRecord empBadrecord) {
+ public void updateEmpBadrecord(EmpBadRecord empBadrecord) {
EmpBadRecord dbData = this.getById(empBadrecord.getBadId());
empBadrecord.setCreateTime(dbData.getCreateTime());
empBadrecord.setCreator(dbData.getCreator());
empBadrecord.setDelFlag(dbData.getDelFlag());
empBadrecord.setModifyTime(new Date());
empBadrecord.setModifier(operatorId);
-
this.saveOrUpdate(empBadrecord);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void deleteEmpBadRecord(EmpBadRecord empBadrecord) {
- UpdateWrapper<EmpBadRecord> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("delFlag", 1);
- updateWrapper.set("modifyTime", new Date());
- updateWrapper.set("modifier", operatorId);
- updateWrapper.set("version", empBadrecord.getVersion() + 1);
+ public void deleteEmpBadrecord(EmpBadRecord empBadrecord) {
+ LambdaQueryWrapper<EmpBadRecord> wrapper = new LambdaQueryWrapper<>();
+// TODO 设置删除条件
+ this.remove(wrapper);
+ }
- updateWrapper.eq("badId", empBadrecord.getBadId());
- this.update(updateWrapper);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpBadrecord(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empBadrecordMapper.logicDeleteByIds(list, operatorId);
}
@Override
- public void logicDelEmpBadRecord(String ids) {
- List<String> list = new ArrayList<>();
+ public boolean momentToNormal(String ids) {
String[] str = ids.split(",");
- list.addAll(Arrays.asList(str));
- empBadrecordMapper.logicDeleteByIds(list, operatorId);
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empBadrecordMapper.momentToNormal(list, operatorId) > 0;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0