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/HrmRegularizeApplicationService.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationService.java
index 5106664..5a9bbbd 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationService.java
@@ -6,8 +6,7 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmRegularizeApplicationSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmRegularizeApplicationDO;
-import java.util.List;
-import java.util.Map;
+import java.util.Set;
/**
* 杞鐢宠 Service 鎺ュ彛
@@ -15,11 +14,6 @@
* @author 瓒呯骇绠＄悊鍛�
*/
public interface HrmRegularizeApplicationService {
-
- /**
- * 瀹℃壒鍒嗙被缂栫爜锛氳浆姝ｅ鎵�
- */
- String APPROVE_CATEGORY_CODE = "hrm_regularize_approve";
/**
* 鍒涘缓杞鐢宠
@@ -68,35 +62,41 @@
PageResult<HrmRegularizeApplicationRespVO> getRegularizeApplicationPage(HrmRegularizeApplicationPageReqVO pageReqVO);
/**
- * 鎻愪氦杞鐢宠瀹℃壒
+ * 鎻愪氦杞鐢宠瀹℃壒锛堣崏绋� / 瀹℃牳涓嶉�氳繃 鈫� 瀹℃壒涓級
+ *
+ * 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴鎸囧畾锛屾彁浜ゆ椂鏃犻渶閫夋嫨銆�
*
* @param id 鐢宠ID
- * @param processDefinitionKey 娴佺▼瀹氫箟Key
- * @param userId 鍙戣捣浜篒D
*/
- void submitRegularizeApplication(Long id, String processDefinitionKey, Long userId);
+ void submitRegularizeApplication(Long id);
/**
- * 鏇存柊杞鐢宠瀹℃壒鐘舵��
+ * 鑾峰緱杞鐢宠鐨勫鎵逛汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳
*
- * @param id 鐢宠ID
- * @param status 瀹℃壒鐘舵��
+ * @return 瀹℃壒浜虹敤鎴风紪鍙烽泦鍚�
*/
- void updateRegularizeApplicationAuditStatus(Long id, Integer status);
+ Set<Long> getRegularizeApplicationApproverUserIds();
/**
- * 鏍规嵁娴佺▼瀹炰緥ID鑾峰彇杞鐢宠
+ * 瀹℃牳杞鐢宠锛堝鎵逛腑 鈫� 瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
*
- * @param processInstanceId 娴佺▼瀹炰緥ID
- * @return 鐢宠淇℃伅
+ * 瀹℃牳閫氳繃鏃跺洖鍐欏憳宸ヤ富妗ｏ紙鐘舵��=鍦ㄨ亴锛岀敤宸ユ�ц川=姝ｅ紡锛岃浆姝ｆ棩鏈燂級銆�
+ *
+ * @param id 鐢宠ID
+ * @param pass 鏄惁閫氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛堜笉閫氳繃鏃跺繀濉級
*/
- HrmRegularizeApplicationDO getRegularizeApplicationByProcessInstanceId(String processInstanceId);
+ void auditRegularizeApplication(Long id, Boolean pass, String reviewRemark);
/**
- * 鑾峰彇杞瀹℃壒娴佺▼瀹氫箟鍒楄〃
+ * 鏍规嵁 BPM 瀹℃壒缁撴灉鍥炲啓杞鐢宠瀹℃壒鐘舵��
*
- * @return 娴佺▼瀹氫箟鍒楄〃
+ * 瀹℃壒閫氳繃鏃跺洖鍐欏憳宸ヤ富妗ｏ紙鐘舵��=鍦ㄨ亴锛岀敤宸ユ�ц川=姝ｅ紡锛岃浆姝ｆ棩鏈燂級銆�
+ *
+ * @param id 鐢宠ID
+ * @param bpmStatus BPM 浠诲姟鐘舵�侊紙2-閫氳繃 3-涓嶉�氳繃 4-鍙栨秷锛�
+ * @param reason 瀹℃壒鎰忚 / 鍙栨秷鍘熷洜
*/
- List<Map<String, Object>> getApproveProcessDefinitionList();
+ void updateRegularizeApplicationAuditStatus(Long id, Integer bpmStatus, String reason);
}
\ No newline at end of file
--
Gitblit v1.9.3