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-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueService.java | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueService.java
index 81da3b0..48fe5f3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueService.java
@@ -1,23 +1,20 @@
package cn.iocoder.yudao.module.mes.service.wm.miscissue;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueDO;
import jakarta.validation.Valid;
import java.util.List;
-import java.util.Map;
+import java.util.Set;
/**
* MES 鏉傞」鍑哄簱鍗� Service 鎺ュ彛
*/
public interface MesWmMiscIssueService {
-
- /**
- * 鏉傞」鍑哄簱 BPM 瀹℃壒鍒嗙被缂栫爜
- */
- String APPROVE_CATEGORY_CODE = "misc_issue_approve";
/**
* 鍒涘缓鏉傞」鍑哄簱鍗�
@@ -58,27 +55,46 @@
PageResult<MesWmMiscIssueDO> getMiscIssuePage(MesWmMiscIssuePageReqVO pageReqVO);
/**
- * 鎻愪氦鏉傞」鍑哄簱鍗曞鎵癸紙鑽夌 鈫� 瀹℃壒涓級锛屽垱寤� BPM 娴佺▼瀹炰緥
+ * 鎻愪氦鏉傞」鍑哄簱鍗曞鎵癸紙鑽夌 鈫� 瀹℃壒涓級
+ *
+ * 瀹℃牳浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴閰嶇疆锛堜笟鍔＄紪鐮� misc_issue_approve锛夛紝
+ * 鎻愪氦鏃舵棤闇�鎸囧畾锛涙湭鍚敤瀹℃壒鎴栨湭閰嶇疆鏈夋晥瀹℃牳浜烘椂鎶涘嚭涓氬姟寮傚父銆�
*
* @param id 缂栧彿
- * @param processDefinitionKey 娴佺▼瀹氫箟 Key
*/
- void submitMiscIssueApproval(Long id, String processDefinitionKey);
+ void submitMiscIssueApproval(Long id);
/**
- * 鏇存柊鏉傞」鍑哄簱鍗曞鎵圭姸鎬侊紙瀹℃壒涓� 鈫� 寰呮墽琛屽嚭搴�/鑽夌/宸插彇娑堬級
+ * 鑾峰緱鏉傞」鍑哄簱鍗曞鎵圭殑瀹℃牳浜虹紪鍙烽泦鍚�
*
- * @param id 缂栧彿
- * @param bpmResult BPM 瀹℃壒缁撴灉
+ * 渚涘墠绔垽鏂綋鍓嶇櫥褰曠敤鎴锋槸鍚﹀簲灞曠ず銆屽鏍搞�嶆寜閽紱鏈厤缃椂杩斿洖绌洪泦鍚堛��
+ *
+ * @return 瀹℃牳浜虹敤鎴风紪鍙烽泦鍚�
*/
- void updateMiscIssueAuditStatus(Long id, Integer bpmResult);
+ Set<Long> getMiscIssueApproverUserIds();
/**
- * 鑾峰彇鏉傞」鍑哄簱瀹℃壒鍙敤鐨� BPM 娴佺▼瀹氫箟鍒楄〃
+ * 瀹℃牳鏉傞」鍑哄簱鍗曪紙瀹℃壒涓� 鈫� 寰呮墽琛屽嚭搴� / 鑽夌锛�
*
- * @return 娴佺▼瀹氫箟鍒楄〃锛坕d/key/name锛�
+ * 浠呬笟鍔＄紪鐮� misc_issue_approve 閰嶇疆鐨勫鏍镐汉鍙搷浣滐紙澶氫汉鏃舵垨绛撅級锛屼笖浠呭湪瀹℃壒涓姸鎬佷笅鍏佽銆�
+ * 瀹℃牳閫氳繃缃负寰呮墽琛屽嚭搴擄紙鍙墽琛屽嚭搴擄級锛涘鏍镐笉閫氳繃蹇呴』濉啓鍘熷洜锛岄��鍥炶崏绋垮彲淇敼鍚庨噸鏂版彁浜ゃ��
+ *
+ * @param id 缂栧彿
+ * @param pass 鏄惁閫氳繃锛宼rue=閫氳繃 / false=涓嶉�氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛屽鏍镐笉閫氳繃鏃跺繀濉�
*/
- List<Map<String, Object>> getMiscIssueApprovalProcessDefinitionList();
+ void auditMiscIssue(Long id, Boolean pass, String reviewRemark);
+
+ /**
+ * 鍥炲啓 BPM 瀹℃壒缁撴灉锛堜緵 BPM 娴佺▼鐘舵�佺洃鍚櫒璋冪敤锛�
+ *
+ * 浠呭湪鍗曟嵁澶勪簬瀹℃壒涓椂鐢熸晥锛氶�氳繃=寰呮墽琛屽嚭搴� / 涓嶉�氳繃=鑽夌 / 鍙栨秷=宸插彇娑堛��
+ *
+ * @param id 缂栧彿
+ * @param bpmStatus BPM 浠诲姟鐘舵�侊紝瑙� {@link cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum}
+ * @param reason 瀹℃壒鎰忚 / 鍙栨秷鍘熷洜
+ */
+ void updateMiscIssueAuditStatus(Long id, Integer bpmStatus, String reason);
/**
* 鎵ц鍑哄簱锛堝緟鎵ц鍑哄簱 鈫� 宸插畬鎴愶級锛屾墸鍑忓簱瀛�
@@ -102,4 +118,13 @@
*/
MesWmMiscIssueDO validateMiscIssueEditable(Long id);
+ /**
+ * 瀵煎叆鏉傞」鍑哄簱鍗�
+ *
+ * @param importList 瀵煎叆鍒楄〃
+ * @param updateSupport 鏄惁鏀寔鏇存柊锛岄粯璁や负 false
+ * @return 瀵煎叆缁撴灉
+ */
+ MesWmMiscIssueImportRespVO importMiscIssueList(List<MesWmMiscIssueImportExcelVO> importList, boolean updateSupport);
+
}
--
Gitblit v1.9.3