From 09c6b3b6fc4ee6b1bc9fa1a6d3da3044729fc95a Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期二, 31 三月 2026 18:50:18 +0800
Subject: [PATCH] fix(hr): 修正年假计算逻辑及代码格式问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java
index 76d3bfb..462a1c6 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java
@@ -73,6 +73,9 @@
EmpBaseInfo empBaseInfo = empBaseInfoService.getById(empOpenarchives.getEmpId());
empBaseInfo.setEntryDate(empOpenarchives.getOpenDate());
empBaseInfo.setEntryType(empOpenarchives.getOpenType());
+ empBaseInfo.setDeptId(Long.valueOf(empOpenarchives.getDeptId()));
+ empBaseInfo.setDeptName(empOpenarchives.getDeptName());
+ empBaseInfo.setAllDeptName(empOpenarchives.getAllDeptName());
empBaseInfo.setEmpStatus("0");
empBaseInfo.setDimissionType("");
empBaseInfo.setDimissionDate(DateUtil.parse("1900-01-01"));
@@ -88,6 +91,7 @@
dimissionLog.setRemark(empOpenarchives.getRemark());
dimissionLog.setCreator(operatorId);
dimissionLog.setModifier(operatorId);
+ dimissionLog.setDeptName(empOpenarchives.getAllDeptName());
dimissionLogService.save(dimissionLog);
}
--
Gitblit v1.8.0