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/dal/mysql/invoice/CrmInvoiceMapper.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
index a5a814f..0f9cdee 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
@@ -12,9 +12,11 @@
import cn.iocoder.yudao.module.crm.enums.common.CrmSceneTypeEnum;
import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -32,6 +34,49 @@
default CrmInvoiceDO selectByNo(String no) {
return selectOne(CrmInvoiceDO::getNo, no);
+ }
+
+ /**
+ * 鎻愪氦瀹℃壒锛氱疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ *
+ * 涔嬫墍浠ョ敤 UpdateWrapper 鑰岄潪 updateById锛歁yBatis-Plus 榛樿鐨勫瓧娈垫洿鏂扮瓥鐣ヤ細蹇界暐 null锛�
+ * 鐩存帴 updateById 鏃犳硶鎶婂鏍镐笉閫氳繃鍚庢畫鐣欑殑瀹℃牳浜恒�佸鏍告椂闂淬�佸鏍告剰瑙佺湡姝ｆ竻绌恒��
+ *
+ * @param id 寮�绁ㄧ紪鍙�
+ * @param status 鐩爣鐘舵�侊紙瀹℃壒涓級
+ * @return 褰卞搷琛屾暟
+ */
+ default int submitAndResetAuditInfo(Long id, Integer status) {
+ return update(null, new LambdaUpdateWrapper<CrmInvoiceDO>()
+ .eq(CrmInvoiceDO::getId, id)
+ .set(CrmInvoiceDO::getAuditStatus, status)
+ .set(CrmInvoiceDO::getReviewerId, null)
+ .set(CrmInvoiceDO::getReviewerName, null)
+ .set(CrmInvoiceDO::getReviewTime, null)
+ .set(CrmInvoiceDO::getReviewRemark, null));
+ }
+
+ /**
+ * 瀹℃牳锛氬啓鍏ュ鏍哥粨鏋溿�佸鏍镐汉涓庡鏍告剰瑙�
+ *
+ * reviewRemark 鍏佽涓� null锛堝鏍搁�氳繃鏃舵剰瑙佸彲閫夛級锛屾晠鍚屾牱浣跨敤 UpdateWrapper 鐩村啓銆�
+ *
+ * @param id 寮�绁ㄧ紪鍙�
+ * @param status 鐩爣鐘舵�侊紙瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
+ * @param reviewerId 瀹℃牳浜虹紪鍙�
+ * @param reviewerName 瀹℃牳浜哄鍚�
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int auditInvoice(Long id, Integer status, Long reviewerId,
+ String reviewerName, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<CrmInvoiceDO>()
+ .eq(CrmInvoiceDO::getId, id)
+ .set(CrmInvoiceDO::getAuditStatus, status)
+ .set(CrmInvoiceDO::getReviewerId, reviewerId)
+ .set(CrmInvoiceDO::getReviewerName, reviewerName)
+ .set(CrmInvoiceDO::getReviewTime, LocalDateTime.now())
+ .set(CrmInvoiceDO::getReviewRemark, reviewRemark));
}
default PageResult<CrmInvoiceDO> selectPageByCustomerId(CrmInvoicePageReqVO reqVO) {
@@ -76,10 +121,11 @@
if (CollUtil.isEmpty(contractIds)) {
return Collections.emptyMap();
}
- // SQL sum 鏌ヨ
+ // SQL sum 鏌ヨ锛堝鎵归�氳繃 + 瀹℃壒涓紝涓庡紑绁ㄩ槻瓒呮牎楠屽彛寰勪竴鑷达級
List<Map<String, Object>> result = selectMaps(new QueryWrapper<CrmInvoiceDO>()
.select("contract_id, SUM(price) AS total_price")
- .eq("audit_status", CrmAuditStatusEnum.APPROVE.getStatus())
+ .in("audit_status", CrmAuditStatusEnum.APPROVE.getStatus(),
+ CrmAuditStatusEnum.PROCESS.getStatus())
.groupBy("contract_id")
.in("contract_id", contractIds));
// 鑾峰緱閲戦
--
Gitblit v1.9.3