From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/cancellation/CrmCancellationController.java | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/cancellation/CrmCancellationController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/cancellation/CrmCancellationController.java
index dcab261..471acb8 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/cancellation/CrmCancellationController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/cancellation/CrmCancellationController.java
@@ -21,12 +21,11 @@
import java.io.IOException;
import java.util.List;
-import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "绠＄悊鍚庡彴 - CRM 閿�鎴风敵璇�")
@RestController
@@ -52,28 +51,27 @@
return success(true);
}
- @PutMapping("/audit")
- @Operation(summary = "瀹℃壒閿�鎴风敵璇凤紙閫氳繃/椹冲洖锛�")
- @PreAuthorize("@ss.hasPermission('crm:cancellation:update')")
- public CommonResult<Boolean> auditCancellation(@Valid @RequestBody CrmCancellationAuditReqVO auditReqVO) {
- cancellationService.auditCancellation(auditReqVO);
- return success(true);
- }
-
@PutMapping("/submit")
- @Operation(summary = "鎻愪氦閿�鎴风敵璇峰鎵�")
+ @Operation(summary = "鎻愪氦閿�鎴风敵璇峰鎵癸紙鑽夌/瀹℃牳涓嶉�氳繃鈫掑鎵逛腑锛夛紝瀹℃壒浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('crm:cancellation:update')")
- public CommonResult<Boolean> submitCancellation(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- cancellationService.submitCancellation(id, processDefinitionKey, getLoginUserId());
+ public CommonResult<Boolean> submitCancellation(@RequestParam("id") Long id) {
+ cancellationService.submitCancellation(id);
return success(true);
}
- @GetMapping("/approve-process-list")
- @Operation(summary = "鑾峰緱閿�鎴风敵璇峰鎵规祦绋嬪畾涔夊垪琛�")
- @PreAuthorize("@ss.hasPermission('crm:cancellation:query')")
- public CommonResult<List<Map<String, Object>>> getCancellationApproveProcessDefinitionList() {
- return success(cancellationService.getCancellationApproveProcessDefinitionList());
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳閿�鎴风敵璇凤紙瀹℃壒涓啋瀹℃牳閫氳繃/瀹℃牳涓嶉�氳繃锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('crm:cancellation:audit')")
+ public CommonResult<Boolean> auditCancellation(@Valid @RequestBody CrmCancellationAuditReqVO auditReqVO) {
+ cancellationService.auditCancellation(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱閿�鎴风敵璇风殑瀹℃壒浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(cancellationService.getCancellationApproverUserIds());
}
@DeleteMapping("/delete")
@@ -88,14 +86,12 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閿�鎴风敵璇�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('crm:cancellation:query')")
public CommonResult<CrmCancellationRespVO> getCancellation(@RequestParam("id") Long id) {
return success(cancellationService.getCancellation(id));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱閿�鎴风敵璇峰垎椤�")
- @PreAuthorize("@ss.hasPermission('crm:cancellation:query')")
public CommonResult<PageResult<CrmCancellationRespVO>> getCancellationPage(@Valid CrmCancellationPageReqVO pageReqVO) {
return success(cancellationService.getCancellationPage(pageReqVO));
}
@@ -111,4 +107,4 @@
ExcelUtils.write(response, "閿�鎴风敵璇�.xls", "鏁版嵁", CrmCancellationRespVO.class, list);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3