From 3513da53dffc309a81f6a24c70b90d0cd779c756 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 22:01:14 +0800
Subject: [PATCH] 提交
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
index 8e01fe4..7213797 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
@@ -93,9 +94,9 @@
LambdaQueryWrapper<EmpInsurance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpInsurance::getEmpId, empInsurance.getEmpId());
lambdaQueryWrapper.eq(EmpInsurance::getApplayDate, empInsurance.getApplayDate());
- lambdaQueryWrapper.eq(EmpInsurance::getDelFlag, 0);
+ lambdaQueryWrapper.ne(EmpInsurance::getDelFlag, 1);
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("此人已在本日期申请过社保");
+ throw new FebsException(MyConstant.MESSAGE);
}
empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empInsurance.setCreator(operatorId);
@@ -109,10 +110,10 @@
LambdaQueryWrapper<EmpInsurance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpInsurance::getEmpId, empInsurance.getEmpId());
lambdaQueryWrapper.eq(EmpInsurance::getApplayDate, empInsurance.getApplayDate());
- lambdaQueryWrapper.eq(EmpInsurance::getDelFlag, 0);
+ lambdaQueryWrapper.ne(EmpInsurance::getDelFlag, 1);
lambdaQueryWrapper.ne(EmpInsurance::getInsuranceId,empInsurance.getInsuranceId());
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("此人已在本日期申请过社保");
+ throw new FebsException(MyConstant.MESSAGE);
}
EmpInsurance dbData = this.getById(empInsurance.getInsuranceId());
empInsurance.setCreateTime(dbData.getCreateTime());
--
Gitblit v1.8.0