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-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 3 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 0a960e5..4d6da14 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,20 +10,24 @@
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;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.invoice.CrmInvoiceDO;
+import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
import cn.iocoder.yudao.module.crm.service.invoice.CrmInvoiceService;
+import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -35,9 +39,12 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
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;
@@ -60,6 +67,8 @@
private CrmContractService contractService;
@Resource
private CrmCustomerService customerService;
+ @Resource
+ private CrmReceivableService receivableService;
@Resource
private AdminUserApi adminUserApi;
@@ -151,6 +160,9 @@
// 1.3 鑾峰緱鍚堝悓鍒楄〃
Map<Long, CrmContractDO> contractMap = contractService.getContractMap(
convertSet(invoiceList, CrmInvoiceDO::getContractId));
+ // 1.4 鑾峰緱姣忓紶寮�绁ㄥ凡鍥炴閲戦锛堣崏绋� + 瀹℃壒涓� + 瀹℃壒閫氳繃锛�
+ Map<Long, BigDecimal> receivablePriceMap = receivableService.getReceivablePriceMapByInvoiceId(
+ convertSet(invoiceList, CrmInvoiceDO::getId));
// 2. 鎷兼帴缁撴灉
return BeanUtils.toBean(invoiceList, CrmInvoiceRespVO.class, (invoiceVO) -> {
// 2.1 鎷兼帴瀹㈡埛鍚嶇О
@@ -166,16 +178,38 @@
findAndThen(contractMap, invoiceVO.getContractId(), contract ->
invoiceVO.setContract(BeanUtils.toBean(contract, CrmContractRespVO.class)));
// 2.4 鎷兼帴鍙戠エ闄勪欢
- invoiceVO.setAttachmentList(storageAttachmentApi.listAttachments("crm_invoice", invoiceVO.getId()));
+ invoiceVO.setAttachmentList(storageAttachmentApi.listAttachments(
+ StorageRecordTypeEnum.CRM_INVOICE.getType(), invoiceVO.getId()));
+ // 2.5 鎷兼帴鏄惁宸蹭笂浼犻檮浠�
+ invoiceVO.setHasAttachment(CollUtil.isNotEmpty(invoiceVO.getAttachmentList()));
+ // 2.6 鎷兼帴鍓╀綑鍙洖娆鹃噾棰�
+ invoiceVO.setRemainingInvoicePrice(invoiceVO.getPrice().subtract(
+ receivablePriceMap.getOrDefault(invoiceVO.getId(), BigDecimal.ZERO)));
});
}
@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 = "鑾峰緱寮�绁ㄧ殑瀹℃壒浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
+ @PreAuthorize("@ss.hasPermission('crm:invoice:query')")
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(invoiceService.getInvoiceApproverUserIds());
}
@GetMapping("/audit-count")
@@ -185,4 +219,41 @@
return success(invoiceService.getAuditInvoiceCount(getLoginUserId()));
}
+ @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()));
+ if (CollUtil.isEmpty(invoices)) {
+ return success(Collections.emptyList());
+ }
+ // 杩囨护锛氬凡涓婁紶鍙戠エ闄勪欢
+ invoices.removeIf(invoice -> CollUtil.isEmpty(storageAttachmentApi.listAttachments(
+ StorageRecordTypeEnum.CRM_INVOICE.getType(), invoice.getId())));
+ if (CollUtil.isEmpty(invoices)) {
+ return success(Collections.emptyList());
+ }
+ // 璁＄畻姣忓紶寮�绁ㄥ凡鍥炴閲戦锛堣崏绋� + 瀹℃壒涓� + 瀹℃壒閫氳繃锛屽彛寰勪笌鍒涘缓鍥炴鏍￠獙涓�鑷达級
+ Map<Long, BigDecimal> receivablePriceMap = receivableService.getReceivablePriceMapByInvoiceId(
+ convertSet(invoices, CrmInvoiceDO::getId));
+ // 杩囨护锛氬墿浣欏彲鍥炴閲戦 > 0 鎵嶅彲閫�
+ List<CrmInvoiceRespVO> result = new ArrayList<>();
+ for (CrmInvoiceDO invoice : invoices) {
+ BigDecimal remainingPrice = invoice.getPrice()
+ .subtract(receivablePriceMap.getOrDefault(invoice.getId(), BigDecimal.ZERO));
+ if (remainingPrice.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ result.add(new CrmInvoiceRespVO() // 鍙繑鍥炵簿绠�瀛楁
+ .setId(invoice.getId()).setNo(invoice.getNo()).setInvoiceNo(invoice.getInvoiceNo())
+ .setInvoiceTitle(invoice.getInvoiceTitle()).setPrice(invoice.getPrice())
+ .setCustomerId(invoice.getCustomerId()).setContractId(invoice.getContractId())
+ .setAuditStatus(invoice.getAuditStatus()).setHasAttachment(true)
+ .setRemainingInvoicePrice(remainingPrice));
+ }
+ return success(result);
+ }
+
}
--
Gitblit v1.9.3