From 6d240fbbf6a47b4125320f26c4f5c537e1493fb6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 十一月 2021 22:19:12 +0800
Subject: [PATCH] fix(bug修复): 到期合同的统计条件修改为只针对在职员工统计
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index bfc400d..3d7e62e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -70,7 +70,7 @@
queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
}
if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empWorkexperience.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empWorkexperience.getEmpStatus().split(","));
} else {
queryWrapper.in("a.EmpStatus", 0);
}
@@ -99,6 +99,11 @@
.orElse("1");
if(!checkRepetitiveData(empWorkexperience)) {
empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ if("1".equals(empWorkexperience.getSex())){
+ empWorkexperience.setSex("男");
+ } else if("2".equals(empWorkexperience.getSex())){
+ empWorkexperience.setSex("女");
+ }
empWorkexperience.setCreator(operatorId);
empWorkexperience.setModifier(operatorId);
this.save(empWorkexperience);
--
Gitblit v1.8.0