From e3c16c62021c97e88c7a9d51aee5b1bb63653430 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期一, 09 十一月 2026 10:00:51 +0800
Subject: [PATCH] feat(hrm): 调岗/离职支持指定申请人,提交免传流程Key,审批通过自动同步员工档案
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java | 62 ++++++++++++++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java | 89 +++++++++++++++++++++++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java | 5 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationSaveReqVO.java | 3 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java | 5 +
5 files changed, 157 insertions(+), 7 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java
index 7bd6ef8..4717570 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java
@@ -83,10 +83,11 @@
@PostMapping("/submit")
@Operation(summary = "鎻愪氦绂昏亴鐢宠瀹℃壒")
@Parameter(name = "id", description = "鐢宠ID", required = true)
- @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key", required = true)
+ @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key锛屼笉浼犲垯鑷姩鍙栬鍒嗙被涓嬫渶鏂扮殑娲昏穬娴佺▼")
@PreAuthorize("@ss.hasPermission('hrm:resignation:submit')")
public CommonResult<Boolean> submitResignationApplication(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ @RequestParam(value = "processDefinitionKey", required = false)
+ String processDefinitionKey) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
resignationApplicationService.submitResignationApplication(id, processDefinitionKey, userId);
return success(true);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java
index 83cd690..f1c63fa7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java
@@ -82,10 +82,11 @@
@PostMapping("/submit")
@Operation(summary = "鎻愪氦璋冨矖鐢宠瀹℃壒")
@Parameter(name = "id", description = "鐢宠ID", required = true)
- @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key", required = true)
+ @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key锛屼笉浼犲垯鑷姩鍙栬鍒嗙被涓嬫渶鏂扮殑娲昏穬娴佺▼")
@PreAuthorize("@ss.hasPermission('hrm:transfer:submit')")
public CommonResult<Boolean> submitTransferApplication(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ @RequestParam(value = "processDefinitionKey", required = false)
+ String processDefinitionKey) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
transferApplicationService.submitTransferApplication(id, processDefinitionKey, userId);
return success(true);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationSaveReqVO.java
index fb19057..e523287 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationSaveReqVO.java
@@ -15,6 +15,9 @@
@Schema(description = "鐢宠ID", example = "1")
private Long id;
+ @Schema(description = "鐢宠浜猴紙琚姙鐞嗙鑱岀殑鍛樺伐ID锛屽墠绔〃鍗曢�夋嫨锛�", example = "1")
+ private Long employeeId;
+
@Schema(description = "鐢宠浜篒D", example = "1")
private Long userId;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
index 54dfc6d..168ed1c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
@@ -13,11 +14,15 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationSaveReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationHandoverReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.HrmEmployeeSaveReqVO;
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.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
+import cn.iocoder.yudao.module.hrm.enums.HrmEmployeeStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmResignationTypeEnum;
+import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.hrm.service.handover.HrmUserHandoverService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -33,6 +38,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -77,11 +83,29 @@
private BpmProcessDefinitionService bpmProcessDefinitionService;
@Resource
private HrmUserHandoverService handoverService;
+ @Resource
+ private HrmEmployeeService employeeService;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createResignationApplication(HrmResignationApplicationSaveReqVO createReqVO) {
+ // 1. 瑙f瀽鐢宠浜猴細浼樺厛鎸夊墠绔�夋嫨鐨勫憳宸ワ紙employeeId锛夊弽鏌ユ。妗堬紝鎷垮埌 system_users.id
Long userId = createReqVO.getUserId();
+ Long employeeId = createReqVO.getEmployeeId();
+ HrmEmployeeDO employee = null;
+ if (employeeId != null) {
+ employee = employeeService.getEmployee(employeeId);
+ }
+ if (employee == null && userId != null) {
+ // 绾﹀畾 user_id 瀛� system_users.id锛涘巻鍙叉暟鎹篃鏈夊瓨銆屽憳宸ヤ富閿�嶇殑锛屼袱绉嶉兘鍏煎
+ employee = employeeService.getEmployeeByUserId(userId);
+ if (employee == null) {
+ employee = employeeService.getEmployee(userId);
+ }
+ }
+ if (employee != null && employee.getUserId() != null) {
+ userId = employee.getUserId();
+ }
if (userId == null) {
userId = getCurrentUserId();
}
@@ -94,11 +118,20 @@
AdminUserRespDTO user = adminUserApi.getUser(userId);
if (user == null) {
userId = getCurrentUserId();
+ user = adminUserApi.getUser(userId);
}
HrmResignationApplicationDO application = BeanUtils.toBean(createReqVO, HrmResignationApplicationDO.class);
application.setNo(no);
application.setUserId(userId);
- application.setDeptId(createReqVO.getDeptId() != null ? createReqVO.getDeptId() : user.getDeptId());
+ // 閮ㄩ棬锛氫紭鍏堢敤璇锋眰閲岀殑锛屽叾娆″憳宸ユ。妗堬紝鏈�鍚庣敤鎴锋。妗�
+ Long deptId = createReqVO.getDeptId();
+ if (deptId == null && employee != null) {
+ deptId = employee.getDeptId();
+ }
+ if (deptId == null && user != null) {
+ deptId = user.getDeptId();
+ }
+ application.setDeptId(deptId);
application.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
application.setHandoverStatus(HANDOVER_STATUS_NOT_STARTED);
resignationApplicationMapper.insert(application);
@@ -245,12 +278,16 @@
throw exception(RESIGNATION_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
validateApproveCategoryAndProcessDefinition();
+ // 鍓嶇涓嶄紶娴佺▼瀹氫箟 Key 鏃讹紝鑷姩鍙栬瀹℃壒鍒嗙被涓嬫渶鏂扮増鏈殑娲昏穬娴佺▼锛岄伩鍏嶃�岃姹傚弬鏁扮己澶�:processDefinitionKey銆�
+ if (StrUtil.isBlank(processDefinitionKey)) {
+ processDefinitionKey = resolveActiveProcessDefinitionKey();
+ }
ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
if (processDefinition == null) {
throw exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
}
String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+ .setProcessDefinitionKey(processDefinition.getKey()).setBusinessKey(String.valueOf(id)));
resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
.id(id)
.processInstanceId(processInstanceId)
@@ -316,6 +353,54 @@
.status(status)
.approveTime(java.time.LocalDateTime.now())
.build());
+ // 瀹℃壒閫氳繃锛氬憳宸ョ姸鎬佹敼鎴愩�岀鑱屻�嶏紝鍚屾鍒板憳宸ョ鐞�
+ if (HrmAuditStatusEnum.APPROVE.getStatus().equals(status)) {
+ syncEmployeeResigned(application);
+ }
+ }
+
+ /**
+ * 鍙栫鑱屽鎵瑰垎绫讳笅鏈�鏂扮増鏈殑娲昏穬娴佺▼瀹氫箟 Key
+ */
+ private String resolveActiveProcessDefinitionKey() {
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ throw exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ return processDefinitions.stream()
+ .filter(pd -> !pd.isSuspended())
+ .max(Comparator.comparingInt(ProcessDefinition::getVersion))
+ .map(ProcessDefinition::getKey)
+ .orElseThrow(() -> exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS));
+ }
+
+ /**
+ * 绂昏亴瀹℃壒閫氳繃鍚庯紝鎶婂憳宸ユ。妗堢殑鐘舵�佹敼鎴愩�岀鑱屻�嶏紝鍚屾鍒板憳宸ョ鐞�
+ *
+ * <p>璧� updateEmployee 鑰屼笉鏄洿鎺ユ敼琛紝杩欐牱 system_users 渚т篃浼氫竴璧峰悓姝ャ��
+ */
+ private void syncEmployeeResigned(HrmResignationApplicationDO application) {
+ try {
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(application.getUserId());
+ if (employee == null) {
+ employee = employeeService.getEmployee(application.getUserId());
+ }
+ if (employee == null) {
+ log.warn("[syncEmployeeResigned][绂昏亴鐢宠({}) 鎵句笉鍒板憳宸ユ。妗堬紝璺宠繃鐘舵�佸悓姝", application.getId());
+ return;
+ }
+ HrmEmployeeSaveReqVO updateReqVO = BeanUtils.toBean(employee, HrmEmployeeSaveReqVO.class);
+ updateReqVO.setEmployeeStatus(HrmEmployeeStatusEnum.LEAVE.getStatus());
+ employeeService.updateEmployee(updateReqVO);
+ log.info("[syncEmployeeResigned][绂昏亴鐢宠({}) 宸插皢鍛樺伐({}) 鐘舵�佹敼涓虹鑱宂",
+ application.getId(), employee.getName());
+ } catch (Exception ex) {
+ // 鍚屾澶辫触涓嶅簲璇ラ樆鏂鎵圭姸鎬佽惤搴擄紝鍙褰曟棩蹇�
+ log.error("[syncEmployeeResigned][绂昏亴鐢宠({}) 鍚屾鍛樺伐鐘舵�佸け璐", application.getId(), ex);
+ }
}
@Override
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
index f7ea50f..fd35910 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
@@ -14,6 +14,7 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationSaveReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.HrmEmployeeSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmTransferApplicationDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmTransferApplicationMapper;
@@ -37,6 +38,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -345,12 +347,16 @@
throw exception(TRANSFER_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
validateApproveCategoryAndProcessDefinition();
+ // 鍓嶇涓嶄紶娴佺▼瀹氫箟 Key 鏃讹紝鑷姩鍙栬瀹℃壒鍒嗙被涓嬫渶鏂扮増鏈殑娲昏穬娴佺▼锛岄伩鍏嶃�岃姹傚弬鏁扮己澶�:processDefinitionKey銆�
+ if (StrUtil.isBlank(processDefinitionKey)) {
+ processDefinitionKey = resolveActiveProcessDefinitionKey();
+ }
ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
if (processDefinition == null) {
throw exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
}
String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+ .setProcessDefinitionKey(processDefinition.getKey()).setBusinessKey(String.valueOf(id)));
transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()
.id(id)
.processInstanceId(processInstanceId)
@@ -416,6 +422,60 @@
.status(status)
.approveTime(java.time.LocalDateTime.now())
.build());
+ // 瀹℃壒閫氳繃锛氭妸鍛樺伐妗f閲岀殑閮ㄩ棬/宀椾綅鍚屾鎴愯皟宀楀悗鐨勭洰鏍囧��
+ if (HrmAuditStatusEnum.APPROVE.getStatus().equals(status)) {
+ syncEmployeePosition(application);
+ }
+ }
+
+ /**
+ * 鍙栬皟宀楀鎵瑰垎绫讳笅鏈�鏂扮増鏈殑娲昏穬娴佺▼瀹氫箟 Key
+ */
+ private String resolveActiveProcessDefinitionKey() {
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ throw exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ return processDefinitions.stream()
+ .filter(pd -> !pd.isSuspended())
+ .max(Comparator.comparingInt(ProcessDefinition::getVersion))
+ .map(ProcessDefinition::getKey)
+ .orElseThrow(() -> exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS));
+ }
+
+ /**
+ * 璋冨矖瀹℃壒閫氳繃鍚庯紝鎶婂憳宸ユ。妗堢殑閮ㄩ棬/宀椾綅鏇存柊涓虹洰鏍囬儴闂�/宀椾綅
+ *
+ * <p>璧� {@link HrmEmployeeService#updateEmployee} 鑰屼笉鏄洿鎺ユ敼琛紝
+ * 杩欐牱 system_users 涓婄殑閮ㄩ棬/宀椾綅鍏宠仈涔熶細涓�骞跺悓姝ワ紝鍛樺伐绠$悊鍒楄〃鑳界珛鍒荤湅鍒版柊宀椾綅銆�
+ */
+ private void syncEmployeePosition(HrmTransferApplicationDO application) {
+ if (application.getTargetDeptId() == null || application.getTargetPostId() == null) {
+ return;
+ }
+ try {
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(application.getUserId());
+ if (employee == null) {
+ employee = employeeService.getEmployee(application.getUserId());
+ }
+ if (employee == null) {
+ log.warn("[syncEmployeePosition][璋冨矖鐢宠({}) 鎵句笉鍒板憳宸ユ。妗堬紝璺宠繃妗f鍚屾]", application.getId());
+ return;
+ }
+ HrmEmployeeSaveReqVO updateReqVO = BeanUtils.toBean(employee, HrmEmployeeSaveReqVO.class);
+ updateReqVO.setDeptId(application.getTargetDeptId());
+ // 璋冨矖鎸夊崟宀椾綅澶勭悊锛岀洿鎺ヨ惤鐩爣宀椾綅
+ updateReqVO.setPostIds(Collections.singletonList(application.getTargetPostId()));
+ employeeService.updateEmployee(updateReqVO);
+ log.info("[syncEmployeePosition][璋冨矖鐢宠({}) 宸插皢鍛樺伐({}) 閮ㄩ棬鏀逛负 {}銆佸矖浣嶆敼涓� {}]",
+ application.getId(), employee.getName(), application.getTargetDeptId(), application.getTargetPostId());
+ } catch (Exception ex) {
+ // 妗f鍚屾澶辫触锛堜緥濡傜洰鏍囬儴闂�/宀椾綅宸茶鍒犻櫎锛変笉搴旇闃绘柇瀹℃壒鐘舵�佽惤搴擄紝鍙褰曟棩蹇�
+ log.error("[syncEmployeePosition][璋冨矖鐢宠({}) 鍚屾鍛樺伐妗f澶辫触]", application.getId(), ex);
+ }
}
@Override
--
Gitblit v1.9.3