From ae60ad1dd19a86dd9723b199111bc3e2fb45f126 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期五, 03 四月 2026 20:58:59 +0800
Subject: [PATCH] refactor(hr): 移除保险提醒相关冗余代码并调整退休延迟计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 ecb2cda..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
@@ -51,7 +51,7 @@
LambdaQueryWrapper<EmpOpenArchives> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpOpenArchives::getDelFlag, 0);
Page<EmpOpenArchives> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "openDate", FebsConstant.ORDER_ASC, true);
return this.page(page, queryWrapper);
}
@@ -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