From 6a48d04a36bc459ed761d787ee3d537652185d36 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 27 十月 2026 15:06:50 +0800
Subject: [PATCH] refactor(permission): 清理新高电力查询菜单及权限注解
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
index 8397ad9..886dad1 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
@@ -10,6 +10,7 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO;
+import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceAuditReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoicePageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceSaveReqVO;
@@ -43,6 +44,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -102,7 +104,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱寮�绁�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:invoice:query')")
public CommonResult<CrmInvoiceRespVO> getInvoice(@RequestParam("id") Long id) {
CrmInvoiceDO invoice = invoiceService.getInvoice(id);
return success(buildInvoiceDetail(invoice));
@@ -117,7 +118,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱寮�绁ㄥ垎椤�")
- @PreAuthorize("@ss.hasPermission('crm:invoice:query')")
public CommonResult<PageResult<CrmInvoiceRespVO>> getInvoicePage(@Valid CrmInvoicePageReqVO pageReqVO) {
PageResult<CrmInvoiceDO> pageResult = invoiceService.getInvoicePage(pageReqVO, getLoginUserId());
return success(new PageResult<>(buildInvoiceDetailList(pageResult.getList()), pageResult.getTotal()));
@@ -187,16 +187,30 @@
}
@PutMapping("/submit")
- @Operation(summary = "鎻愪氦寮�绁ㄥ鎵�")
+ @Operation(summary = "鎻愪氦寮�绁ㄥ鎵癸紙鑽夌/瀹℃牳涓嶉�氳繃鈫掑鎵逛腑锛夛紝瀹℃壒浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('crm:invoice:update')")
public CommonResult<Boolean> submitInvoice(@RequestParam("id") Long id) {
- invoiceService.submitInvoice(id, getLoginUserId());
+ invoiceService.submitInvoice(id);
return success(true);
+ }
+
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳寮�绁紙瀹℃壒涓啋瀹℃牳閫氳繃/瀹℃牳涓嶉�氳繃锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('crm:invoice:audit')")
+ public CommonResult<Boolean> auditInvoice(@Valid @RequestBody CrmInvoiceAuditReqVO auditReqVO) {
+ invoiceService.auditInvoice(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱寮�绁ㄧ殑瀹℃壒浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(invoiceService.getInvoiceApproverUserIds());
}
@GetMapping("/audit-count")
@Operation(summary = "鑾峰緱寰呭鏍稿紑绁ㄦ暟閲�")
- @PreAuthorize("@ss.hasPermission('crm:invoice:query')")
public CommonResult<Long> getAuditInvoiceCount() {
return success(invoiceService.getAuditInvoiceCount(getLoginUserId()));
}
@@ -204,7 +218,6 @@
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱寮�绁ㄧ簿绠�鍒楄〃", description = "鍙寘鍚鏍搁�氳繃涓斿凡涓婁紶鍙戠エ闄勪欢鐨勫紑绁紝涓昏鐢ㄤ簬鍥炴鍒涘缓鏃堕�夋嫨鍏宠仈寮�绁�")
@Parameter(name = "contractId", description = "鍚堝悓缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('crm:invoice:query')")
public CommonResult<List<CrmInvoiceRespVO>> getInvoiceSimpleList(@RequestParam("contractId") Long contractId) {
List<CrmInvoiceDO> invoices = invoiceService.getInvoiceListByContractIdAndStatus(contractId,
List.of(CrmAuditStatusEnum.APPROVE.getStatus()));
--
Gitblit v1.9.3