From 1c7cb9c300fda246db57ef5c43d118c7eaef22d6 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 01 三月 2021 20:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 1b2cbdf..7f81dd7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -6,6 +6,8 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -84,7 +86,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpUnemployment(EmpUnemployment empUnemployment) {
+ public void createEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
+ lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate() );
+ lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empUnemployment.setCreator(operatorId);
empUnemployment.setModifier(operatorId);
@@ -93,7 +102,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpUnemployment(EmpUnemployment empUnemployment) {
+ public void updateEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
+ lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
+ lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
+ lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId,empUnemployment.getUnemploymentId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
EmpUnemployment dbData = this.getById(empUnemployment.getUnemploymentId());
empUnemployment.setCreateTime(dbData.getCreateTime());
empUnemployment.setCreator(dbData.getCreator());
@@ -161,4 +178,4 @@
this.save(empUnemployment);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0