From bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:37:57 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_business' into fix/hsy/20260811
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
index 88b79d1..45c7cb9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
@@ -124,15 +124,24 @@
return success(true);
}
- @PutMapping("/audit")
- @Operation(summary = "瀹℃牳璁捐椤圭洰锛堝緟瀹℃牳鈫掑緟褰掓。锛�")
+ @PutMapping("/submit-approval")
+ @Operation(summary = "鎻愪氦璁捐椤圭洰瀹℃壒锛堝緟瀹℃牳鈫掑鎵逛腑锛�")
@Parameter(name = "id", description = "缂栧彿", required = true)
+ @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟 Key", required = true)
@PreAuthorize("@ss.hasPermission('mes:pd-project:update')")
- public CommonResult<Boolean> auditProject(@RequestParam("id") Long id) {
- projectService.auditProject(id);
+ public CommonResult<Boolean> submitProjectApproval(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ projectService.submitProjectApproval(id, processDefinitionKey);
return success(true);
}
+ @GetMapping("/approve-process-list")
+ @Operation(summary = "鑾峰緱璁捐椤圭洰瀹℃壒娴佺▼鍒楄〃")
+ @PreAuthorize("@ss.hasPermission('mes:pd-project:update')")
+ public CommonResult<List<Map<String, Object>>> getProjectApproveProcessDefinitionList() {
+ return success(projectService.getProjectApproveProcessDefinitionList());
+ }
+
@PutMapping("/archive")
@Operation(summary = "褰掓。璁捐椤圭洰锛堝緟褰掓。鈫掑凡褰掓。锛夛紝鍚屾椂鑷姩鍒涘缓褰掓。鍙拌处")
@Parameter(name = "id", description = "缂栧彿", required = true)
--
Gitblit v1.9.3