From b852254d90e7d1955db31db154193ec8ee84d8b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:57:59 +0800
Subject: [PATCH] feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java
index 7966bf3..0ab04dd 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java
@@ -2,7 +2,9 @@
import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmResignationApplicationDO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmResignationApplicationMapper;
+import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.service.approval.HrmResignationApplicationService;
import cn.iocoder.yudao.module.hrm.util.HrmAuditStatusUtils;
@@ -14,16 +16,23 @@
/**
* 绂昏亴鐢宠瀹℃壒鐨勭粨鏋滅洃鍚櫒瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Component
@Slf4j
public class HrmResignationApplicationStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
+ /**
+ * 鍛樺伐鐘舵�侊細绂昏亴
+ */
+ private static final Integer EMPLOYEE_STATUS_RESIGNED = 3;
+
@Resource
private HrmResignationApplicationService resignationApplicationService;
@Resource
private HrmResignationApplicationMapper resignationApplicationMapper;
+ @Resource
+ private HrmEmployeeMapper employeeMapper;
@Override
public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
@@ -50,6 +59,25 @@
// 鏇存柊瀹℃壒鐘舵��
Integer auditStatus = HrmAuditStatusUtils.convertBpmResultToAuditStatus(event.getStatus());
resignationApplicationService.updateResignationApplicationAuditStatus(applicationId, auditStatus);
+ // 瀹℃壒閫氳繃锛氬洖鍐欏憳宸ヤ富妗ｏ紙鐘舵��=绂昏亴锛岀鑱屾棩鏈� = 瀹為檯绂昏亴鏃ユ湡鎴栭璁＄鑱屾棩鏈燂級
+ if (HrmAuditStatusEnum.APPROVE.getStatus().equals(auditStatus)) {
+ writeBackEmployee(application);
+ }
+ }
+
+ private void writeBackEmployee(HrmResignationApplicationDO application) {
+ HrmEmployeeDO employee = employeeMapper.selectByUserId(application.getUserId());
+ if (employee == null) {
+ log.warn("[writeBackEmployee] 绂昏亴鐢宠({}) 鐢ㄦ埛({}) 鏈壘鍒板憳宸ユ。妗堬紝璺宠繃鍥炲啓", application.getId(), application.getUserId());
+ return;
+ }
+ java.time.LocalDate leaveDate = application.getActualDate() != null
+ ? application.getActualDate() : application.getExpectedDate();
+ employeeMapper.updateById(HrmEmployeeDO.builder()
+ .id(employee.getId())
+ .employeeStatus(EMPLOYEE_STATUS_RESIGNED)
+ .leaveDate(leaveDate)
+ .build());
}
}
\ No newline at end of file
--
Gitblit v1.9.3