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/performanceappraise/HrmPerformanceAppraiseService.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseService.java
index 8367ecb..3b854dd 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseService.java
@@ -9,7 +9,7 @@
import java.util.Collection;
import java.util.List;
-import java.util.Map;
+import java.util.Set;
/**
* HRM 缁╂晥鑰冩牳鏂规 Service 鎺ュ彛
@@ -37,24 +37,42 @@
void saveAppraiseItems(HrmPerformanceAppraiseItemSaveReqVO saveReqVO);
/**
- * 鎻愪氦缁╂晥鑰冩牳鏂规瀹℃壒
+ * 鎻愪氦缁╂晥鑰冩牳鏂规瀹℃壒锛堣崏绋� / 瀹℃牳涓嶉�氳繃 鈫� 瀹℃壒涓級
+ *
+ * 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴鎸囧畾锛屾彁浜ゆ椂鏃犻渶閫夋嫨銆�
+ *
+ * @param id 鏂规缂栧彿
*/
- void submitAppraise(Long id, String processDefinitionKey, Long userId);
+ void submitAppraise(Long id);
/**
- * 瀹℃壒缁╂晥鑰冩牳鏂规锛堥�氳繃/椹冲洖锛宮anual锛�
+ * 鑾峰緱缁╂晥鑰冩牳鏂规鐨勫鎵逛汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳
+ *
+ * @return 瀹℃壒浜虹敤鎴风紪鍙烽泦鍚�
*/
- void auditAppraise(HrmPerformanceAppraiseAuditReqVO auditReqVO);
+ Set<Long> getAppraiseApproverUserIds();
/**
- * 鏇存柊缁╂晥鑰冩牳鏂规瀹℃壒鐘舵�侊紙BPM 鐩戝惉鍥炶皟锛�
+ * 瀹℃牳缁╂晥鑰冩牳鏂规锛堝鎵逛腑 鈫� 瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
+ *
+ * 瀹℃牳閫氳繃鏃舵柟妗堢姸鎬佹祦杞负銆屽凡鍙戝竷銆嶃��
+ *
+ * @param id 鏂规缂栧彿
+ * @param pass 鏄惁閫氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛堜笉閫氳繃鏃跺繀濉級
*/
- void updateAppraiseAuditStatus(Long id, Integer bpmResult);
+ void auditAppraise(Long id, Boolean pass, String reviewRemark);
/**
- * 鑾峰緱缁╂晥鑰冩牳鏂规瀹℃壒娴佺▼瀹氫箟鍒楄〃
+ * 鏍规嵁 BPM 瀹℃壒缁撴灉鍥炲啓缁╂晥鑰冩牳鏂规瀹℃壒鐘舵��
+ *
+ * 瀹℃壒閫氳繃鏃舵柟妗堢姸鎬佹祦杞负銆屽凡鍙戝竷銆嶃��
+ *
+ * @param id 鏂规缂栧彿
+ * @param bpmStatus BPM 浠诲姟鐘舵�侊紙2-閫氳繃 3-涓嶉�氳繃 4-鍙栨秷锛�
+ * @param reason 瀹℃壒鎰忚 / 鍙栨秷鍘熷洜
*/
- List<Map<String, Object>> getAppraiseApproveProcessDefinitionList();
+ void updateAppraiseAuditStatus(Long id, Integer bpmStatus, String reason);
/**
* 淇濆瓨鍛樺伐鑰冩牳缁撴灉锛堟寜鍛樺伐閫愭寚鏍囨墦鍒嗭紝鑷姩璁＄畻缁煎悎寰楀垎涓庢。绾э級
@@ -84,4 +102,14 @@
*/
Integer generateAppraisees(Long appraiseId);
+ /**
+ * 瀵煎叆缁╂晥鑰冩牳鏂规鍒楄〃锛堝鍏ョ殑鍧囦负鑽夌锛�
+ *
+ * @param importList 瀵煎叆鍒楄〃
+ * @param importReqVO 瀵煎叆璇锋眰鍙傛暟
+ * @return 瀵煎叆缁撴灉
+ */
+ HrmPerformanceAppraiseImportRespVO importAppraiseList(List<HrmPerformanceAppraiseImportExcelVO> importList,
+ HrmPerformanceAppraiseImportReqVO importReqVO);
+
}
--
Gitblit v1.9.3