From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationService.java | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationService.java
index 2440b28..e7de52c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationService.java
@@ -4,28 +4,18 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationPageReqVO;
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.dal.dataobject.approval.HrmResignationApplicationDO;
import jakarta.validation.Valid;
-import java.util.List;
-import java.util.Map;
+import java.util.Set;
/**
* 绂昏亴鐢宠 Service 鎺ュ彛
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
public interface HrmResignationApplicationService {
-
- /**
- * BPM 绂昏亴瀹℃壒娴佺▼鏍囪瘑
- */
- String BPM_PROCESS_DEFINITION_KEY = "hrm_resignation";
-
- /**
- * BPM 绂昏亴瀹℃壒鍒嗙被缂栫爜
- */
- String APPROVE_CATEGORY_CODE = "hrm_resignation_approve";
/**
* 鍒涘缓绂昏亴鐢宠
@@ -74,35 +64,48 @@
PageResult<HrmResignationApplicationRespVO> getResignationApplicationPage(HrmResignationApplicationPageReqVO pageReqVO);
/**
- * 鎻愪氦绂昏亴鐢宠瀹℃壒
+ * 鎻愪氦绂昏亴鐢宠瀹℃壒锛堣崏绋� / 瀹℃牳涓嶉�氳繃 鈫� 瀹℃壒涓級
+ *
+ * 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴鎸囧畾锛屾彁浜ゆ椂鏃犻渶閫夋嫨銆�
*
* @param id 鐢宠ID
- * @param processDefinitionKey 娴佺▼瀹氫箟Key
- * @param userId 鎻愪氦浜篒D
*/
- void submitResignationApplication(Long id, String processDefinitionKey, Long userId);
+ void submitResignationApplication(Long id);
/**
- * 鑾峰彇鍙敤鐨勫鎵规祦绋嬪畾涔夊垪琛�
+ * 鑾峰緱绂昏亴鐢宠鐨勫鎵逛汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳
*
- * @return 娴佺▼瀹氫箟鍒楄〃
+ * @return 瀹℃壒浜虹敤鎴风紪鍙烽泦鍚�
*/
- List<Map<String, Object>> getApproveProcessDefinitionList();
+ Set<Long> getResignationApplicationApproverUserIds();
/**
- * 鏇存柊绂昏亴鐢宠瀹℃壒鐘舵�侊紙BPM 鍥炶皟锛�
+ * 瀹℃牳绂昏亴鐢宠锛堝鎵逛腑 鈫� 瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
*
- * @param id 鐢宠ID
- * @param status 瀹℃壒鐘舵��
+ * 瀹℃牳閫氳繃鏃跺洖鍐欏憳宸ヤ富妗ｏ紙鐘舵��=绂昏亴锛岀鑱屾棩鏈燂級銆�
+ *
+ * @param id 鐢宠ID
+ * @param pass 鏄惁閫氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛堜笉閫氳繃鏃跺繀濉級
*/
- void updateResignationApplicationAuditStatus(Long id, Integer status);
+ void auditResignationApplication(Long id, Boolean pass, String reviewRemark);
/**
- * 鏍规嵁娴佺▼瀹炰緥ID鑾峰彇绂昏亴鐢宠
+ * 鏍规嵁 BPM 瀹℃壒缁撴灉鍥炲啓绂昏亴鐢宠瀹℃壒鐘舵��
*
- * @param processInstanceId 娴佺▼瀹炰緥ID
- * @return 绂昏亴鐢宠
+ * 瀹℃壒閫氳繃鏃跺洖鍐欏憳宸ヤ富妗ｏ紙鐘舵��=绂昏亴锛岀鑱屾棩鏈燂級銆�
+ *
+ * @param id 鐢宠ID
+ * @param bpmStatus BPM 浠诲姟鐘舵�侊紙2-閫氳繃 3-涓嶉�氳繃 4-鍙栨秷锛�
+ * @param reason 瀹℃壒鎰忚 / 鍙栨秷鍘熷洜
*/
- HrmResignationApplicationDO getResignationApplicationByProcessInstanceId(String processInstanceId);
+ void updateResignationApplicationAuditStatus(Long id, Integer bpmStatus, String reason);
+
+ /**
+ * 鏇存柊绂昏亴鐢宠浜ゆ帴鐘舵��
+ *
+ * @param reqVO 浜ゆ帴鐘舵�佹洿鏂颁俊鎭�
+ */
+ void updateHandoverStatus(@Valid HrmResignationHandoverReqVO reqVO);
}
\ No newline at end of file
--
Gitblit v1.9.3