From 44e0f0472d8efa0646b20db8a40c16beab0b752e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 06 四月 2024 12:22:12 +0800
Subject: [PATCH] feat: 一些需求改进 打开档案时增加了部门选择项 处理了合同信息录入时的性别不自动填入问题 合同到期提醒模块发布
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 249fb05..c38bb66 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -214,15 +214,15 @@
}
/**
- *
* 增加员工后同步增加入职记录
- *
+ * <p>
* date 2021-07-30 09:12
- * @author: luoyibo
+ *
* @param empBaseInfo 员工信息
- * @param operatorId 操作员Id
- * @param empId 员工Id
+ * @param operatorId 操作员Id
+ * @param empId 员工Id
* @return void
+ * @author: luoyibo
*/
private void addEmpDimissLog(EmpBaseInfo empBaseInfo, String operatorId, Long empId) {
EmpDimissionLog dimissionLog = new EmpDimissionLog();
@@ -231,6 +231,7 @@
dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
dimissionLog.setDimissionType("20");
dimissionLog.setRemark(empBaseInfo.getRemark());
+ dimissionLog.setDeptName(empBaseInfo.getAllDeptName());
dimissionLog.setCreator(operatorId);
dimissionLog.setModifier(operatorId);
@@ -355,6 +356,10 @@
String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
+// for (int i = 0, j = str.length; i < j; i++) {
+// EmpBaseInfo emp = this.getById(str[i]);
+// addEmpDimissLog(emp, operatorId, Long.valueOf(str[i]));
+// }
return empBaseInfoMapper.momentToNormal(list, operatorId) > 0;
}
@@ -380,6 +385,7 @@
public boolean closeEmpArchives(EmpDimissionLog empDimissionLog) {
String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
String[] str = empDimissionLog.getEmpIds().split(",");
+ String[] empDeptNames = empDimissionLog.getDeptNames().split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
String[] strDate = empDimissionLog.getEntryDates().split(",");
@@ -396,6 +402,7 @@
dimissionLog.setReporter(empDimissionLog.getReporter());
dimissionLog.setCreator(operatorId);
dimissionLog.setModifier(operatorId);
+ dimissionLog.setDeptName(empDeptNames[i]);
dimissionLogService.save(dimissionLog);
}
@@ -656,7 +663,7 @@
empBaseInfo.setEmpStatus("0");
this.save(empBaseInfo);
//新入职员工需要增加一条入职记录
- this.addEmpDimissLog(empBaseInfo,"2",empBaseInfo.getEmpId());
+ this.addEmpDimissLog(empBaseInfo, "2", empBaseInfo.getEmpId());
}
}
@@ -1189,7 +1196,7 @@
public void accept(QueryWrapper<EmpBaseInfo> wrapper) {
for (int i = 0; i < certificates.length; i++) {
String ageBtn = "|" + certificates[i] + "|";
- wrapper.gt("LOCATE('"+ageBtn+"',CONCAT('|',replace( certificateList, ',', '|,|'),'|'))",0);
+ wrapper.gt("LOCATE('" + ageBtn + "',CONCAT('|',replace( certificateList, ',', '|,|'),'|'))", 0);
}
}
};
@@ -1435,14 +1442,14 @@
@Override
public boolean updateEmpAge(String userId) {
List<EmpBaseInfo> empBaseInfoList = new ArrayList<>();
- if(StringUtils.isNotBlank(userId)){
+ if (StringUtils.isNotBlank(userId)) {
EmpBaseInfo empBaseInfo = this.getById(userId);
empBaseInfoList.add(empBaseInfo);
} else {
empBaseInfoList = this.list();
}
- if(empBaseInfoList.size()>0){
- empBaseInfoList.forEach(p->{
+ if (empBaseInfoList.size() > 0) {
+ empBaseInfoList.forEach(p -> {
p.setAge(DateUtil.ageOfNow(p.getBirthdate()));
this.saveOrUpdate(p);
});
--
Gitblit v1.8.0