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/pd/project/MesPdProjectService.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectService.java
index 54deaeb..42b61e5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectService.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mes.service.pd.project;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pd.project.MesPdProjectDO;
@@ -9,6 +11,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* MES 璁捐椤圭洰 Service 鎺ュ彛
@@ -82,28 +85,46 @@
/**
* 鎻愪氦璁捐椤圭洰瀹℃壒锛堝緟瀹℃牳鈫掑鎵逛腑锛�
- * <p>
- * 鍒涘缓 BPM 娴佺▼瀹炰緥锛屽鎵归�氳繃鍚庣敱鐩戝惉鍣ㄥ洖璋冩洿鏂颁负寰呭綊妗�
*
- * @param id 缂栧彿
- * @param processDefinitionKey 娴佺▼瀹氫箟 Key
+ * 瀹℃牳浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴閰嶇疆锛堜笟鍔＄紪鐮� mes_pd_project_approve锛夛紝
+ * 鎻愪氦鏃舵棤闇�鎸囧畾锛涙湭鍚敤瀹℃壒鎴栨湭閰嶇疆鏈夋晥瀹℃牳浜烘椂鎶涘嚭涓氬姟寮傚父銆�
+ *
+ * @param id 缂栧彿
*/
- void submitProjectApproval(Long id, String processDefinitionKey);
+ void submitProjectApproval(Long id);
/**
- * 鑾峰緱璁捐椤圭洰瀹℃壒娴佺▼鍒楄〃
+ * 鑾峰緱璁捐椤圭洰瀹℃壒鐨勫鏍镐汉缂栧彿闆嗗悎
*
- * @return 娴佺▼鍒楄〃锛坕d/name/version/key锛�
+ * 渚涘墠绔垽鏂綋鍓嶇櫥褰曠敤鎴锋槸鍚﹀簲灞曠ず銆屽鏍搞�嶆寜閽紱鏈厤缃椂杩斿洖绌洪泦鍚堛��
+ *
+ * @return 瀹℃牳浜虹敤鎴风紪鍙烽泦鍚�
*/
- List<Map<String, Object>> getProjectApproveProcessDefinitionList();
+ Set<Long> getProjectApproverUserIds();
/**
- * 鏇存柊璁捐椤圭洰瀹℃壒鐘舵�侊紙BPM 鐩戝惉鍣ㄥ洖璋冿級
+ * 瀹℃牳璁捐椤圭洰锛堝鎵逛腑鈫掑緟褰掓。 / 寰呭鏍革級
*
- * @param id 缂栧彿
- * @param bpmResult BPM 瀹℃壒缁撴灉
+ * 浠呬笟鍔＄紪鐮� mes_pd_project_approve 閰嶇疆鐨勫鏍镐汉鍙搷浣滐紙澶氫汉鏃舵垨绛撅級锛屼笖浠呭湪瀹℃壒涓姸鎬佷笅鍏佽銆�
+ * 瀹℃牳閫氳繃缃负寰呭綊妗ｏ紱瀹℃牳涓嶉�氳繃蹇呴』濉啓鍘熷洜锛岄��鍥炲緟瀹℃牳鐘舵�佸彲淇敼鍚庨噸鏂版彁浜ゃ��
+ *
+ * @param id 缂栧彿
+ * @param pass 鏄惁閫氳繃锛宼rue=閫氳繃 / false=涓嶉�氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛屽鏍镐笉閫氳繃鏃跺繀濉�
*/
- void updateProjectAuditStatus(Long id, Integer bpmResult);
+ void auditProject(Long id, Boolean pass, String reviewRemark);
+
+ /**
+ * 鍥炲啓 BPM 瀹℃壒缁撴灉锛堜緵 BPM 娴佺▼鐘舵�佺洃鍚櫒璋冪敤锛�
+ *
+ * 浠呭湪鍗曟嵁澶勪簬瀹℃壒涓椂鐢熸晥锛氬鎵归�氳繃缃负寰呭綊妗ｏ紝瀹℃壒涓嶉�氳繃閫�鍥炲緟瀹℃牳銆�
+ * 璁捐椤圭洰娌℃湁銆屽凡鍙栨秷銆嶇姸鎬侊紝鍏朵綑 BPM 缁撴灉蹇界暐銆�
+ *
+ * @param id 缂栧彿
+ * @param bpmStatus BPM 浠诲姟鐘舵�侊紝瑙� {@link cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum}
+ * @param reason 瀹℃壒鎰忚 / 鍙栨秷鍘熷洜
+ */
+ void updateProjectAuditStatus(Long id, Integer bpmStatus, String reason);
/**
* 褰掓。璁捐椤圭洰锛堝緟褰掓。鈫掑凡褰掓。锛�
@@ -125,4 +146,14 @@
List<MesPdProjectDO> getProjectByProductCode(String productCode);
+ /**
+ * 鎵归噺瀵煎叆璁捐椤圭洰
+ *
+ * @param importList 瀵煎叆璁捐椤圭洰鍒楄〃
+ * @param updateSupport 鏄惁鏀寔鏇存柊
+ * @return 瀵煎叆缁撴灉
+ */
+ MesPdProjectImportRespVO importProjectList(List<MesPdProjectImportExcelVO> importList,
+ boolean updateSupport);
+
}
--
Gitblit v1.9.3