From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机(新增:audit接口/审核人字段/DB变更脚本)
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
index 21fe41e..93b2c09 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
@@ -9,6 +9,7 @@
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentAuditReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentSaveReqVO;
@@ -38,6 +39,7 @@
import java.io.IOException;
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;
@@ -79,15 +81,31 @@
return success(true);
}
- @PutMapping("/update-status")
- @Operation(summary = "鏇存柊浠樻鍗曠殑鐘舵��")
- @PreAuthorize("@ss.hasPermission('erp:finance-payment:update-status')")
- public CommonResult<Boolean> updateFinancePaymentStatus(@RequestParam("id") Long id,
- @RequestParam("status") Integer status) {
- financePaymentService.updateFinancePaymentStatus(id, status);
+ @PutMapping("/submit")
+ @Operation(summary = "鎻愪氦浠樻鍗曞鎵癸紙鏈鏍� 鈫� 瀹℃壒涓級锛屽鎵逛汉鐢卞鎵归厤缃粺涓�鎸囧畾")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('erp:finance-payment:update')")
+ public CommonResult<Boolean> submitFinancePayment(@RequestParam("id") Long id) {
+ financePaymentService.submitFinancePayment(id);
return success(true);
}
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳浠樻鍗曪紙瀹℃壒涓� 鈫� 瀹℃牳閫氳繃/瀹℃牳涓嶉�氳繃锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('erp:finance-payment:audit')")
+ public CommonResult<Boolean> auditFinancePayment(@Valid @RequestBody ErpFinancePaymentAuditReqVO auditReqVO) {
+ financePaymentService.auditFinancePayment(auditReqVO.getId(), auditReqVO.getPass(),
+ auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱浠樻鍗曠殑瀹℃壒浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
+ @PreAuthorize("@ss.hasPermission('erp:finance-payment:query')")
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(financePaymentService.getFinancePaymentApproverUserIds());
+ }
+
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎浠樻鍗�")
@Parameter(name = "ids", description = "缂栧彿鏁扮粍", required = true)
--
Gitblit v1.9.3