From bee96a1d36c86068cd5a7eb69f4e3294a8123b04 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 03 七月 2026 18:02:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
index 01b1a2d..b6df80f 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
@@ -176,11 +176,19 @@
@PutMapping("/submit")
@Operation(summary = "鎻愪氦鍚堝悓瀹℃壒")
@PreAuthorize("@ss.hasPermission('crm:contract:update')")
- public CommonResult<Boolean> submitContract(@RequestParam("id") Long id) {
- contractService.submitContract(id, getLoginUserId());
+ public CommonResult<Boolean> submitContract(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ contractService.submitContract(id, processDefinitionKey, getLoginUserId());
return success(true);
}
+ @GetMapping("/approve-process-list")
+ @Operation(summary = "鑾峰彇鍚堝悓瀹℃壒娴佺▼鍒楄〃")
+ @PreAuthorize("@ss.hasPermission('crm:contract:query')")
+ public CommonResult<List<Map<String, Object>>> getContractApproveProcessList() {
+ return success(contractService.getContractApproveProcessDefinitionList());
+ }
+
private List<CrmContractRespVO> buildContractDetailList(List<CrmContractDO> contractList) {
if (CollUtil.isEmpty(contractList)) {
return Collections.emptyList();
--
Gitblit v1.9.3