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/attendance/HrmAttendanceExceptionService.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionService.java
index 1554c66..d29aa93 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionService.java
@@ -6,10 +6,12 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
import jakarta.validation.Valid;
+import java.util.Set;
+
/**
* 鑰冨嫟寮傚父鐢宠 Service 鎺ュ彛
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
public interface HrmAttendanceExceptionService {
@@ -39,20 +41,41 @@
HrmAttendanceExceptionDO getAttendanceException(Long id);
/**
- * 鎻愪氦鑰冨嫟寮傚父鐢宠
+ * 鎻愪氦鑰冨嫟寮傚父鐢宠瀹℃壒锛堣崏绋� / 瀹℃牳涓嶉�氳繃 鈫� 瀹℃壒涓級
+ *
+ * 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴鎸囧畾锛屾彁浜ゆ椂鏃犻渶閫夋嫨銆�
*
* @param id 鐢宠ID
- * @param processDefinitionKey 娴佺▼瀹氫箟Key
- * @param userId 鎻愪氦浜篒D
*/
- void submitAttendanceException(Long id, String processDefinitionKey, Long userId);
+ void submitAttendanceException(Long id);
/**
- * 鏇存柊鑰冨嫟寮傚父鐢宠瀹℃壒鐘舵��
+ * 鑾峰緱鑰冨嫟寮傚父鐢宠鐨勫鎵逛汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳
*
- * @param id 鐢宠ID
- * @param auditStatus 瀹℃壒鐘舵��
+ * @return 瀹℃壒浜虹敤鎴风紪鍙烽泦鍚�
*/
- void updateAttendanceExceptionAuditStatus(Long id, Integer auditStatus);
+ Set<Long> getAttendanceExceptionApproverUserIds();
+
+ /**
+ * 瀹℃牳鑰冨嫟寮傚父鐢宠锛堝鎵逛腑 鈫� 瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
+ *
+ * 瀹℃牳閫氳繃鏃舵墽琛屽悗缃笟鍔￠�昏緫锛氳ˉ鍗″洖濉笂涓嬬彮鏃堕棿 / 鍔犵彮鍥炲啓鍔犵彮鏃堕暱銆�
+ *
+ * @param id 鐢宠ID
+ * @param pass 鏄惁閫氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛堜笉閫氳繃鏃跺繀濉級
+ */
+ void auditAttendanceException(Long id, Boolean pass, String reviewRemark);
+
+ /**
+ * 鏍规嵁 BPM 瀹℃壒缁撴灉鍥炲啓鑰冨嫟寮傚父鐢宠瀹℃壒鐘舵��
+ *
+ * 瀹℃壒閫氳繃鏃舵墽琛屽悗缃笟鍔￠�昏緫锛氳ˉ鍗″洖濉笂涓嬬彮鏃堕棿 / 鍔犵彮鍥炲啓鍔犵彮鏃堕暱銆�
+ *
+ * @param id 鐢宠ID
+ * @param bpmStatus BPM 浠诲姟鐘舵�侊紙2-閫氳繃 3-涓嶉�氳繃 4-鍙栨秷锛�
+ * @param reason 瀹℃壒鎰忚 / 鍙栨秷鍘熷洜
+ */
+ void updateAttendanceExceptionAuditStatus(Long id, Integer bpmStatus, String reason);
}
\ No newline at end of file
--
Gitblit v1.9.3