From 4bc513be11e671caf20ec6013a51dee42c2ed96e Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 18:31:26 +0800
Subject: [PATCH] fix(crm): 禁止物料类合同开票
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 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 9dcbca0..ccb8247 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;
@@ -34,10 +36,75 @@
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)
+ .in(CrmInvoiceDO::getAuditStatus, CrmAuditStatusEnum.DRAFT.getStatus(),
+ CrmAuditStatusEnum.REJECT.getStatus())
+ .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)
+ .eq(CrmInvoiceDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
+ .set(CrmInvoiceDO::getAuditStatus, status)
+ .set(CrmInvoiceDO::getReviewerId, reviewerId)
+ .set(CrmInvoiceDO::getReviewerName, reviewerName)
+ .set(CrmInvoiceDO::getReviewTime, LocalDateTime.now())
+ .set(CrmInvoiceDO::getReviewRemark, reviewRemark));
+ }
+
+ /**
+ * BPM 瀹℃壒缁撴潫鍚庡洖鍐欏紑绁ㄧ姸鎬�
+ *
+ * 浠呭綋寮�绁ㄤ粛澶勪簬銆屽鎵逛腑銆嶆椂鏇存柊锛岄伩鍏嶄笌鏃у鎵硅矾寰勯噸澶嶈鐩栥��
+ *
+ * @param id 寮�绁ㄧ紪鍙�
+ * @param status 鐩爣鐘舵�侊紙瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃 / 宸插彇娑堬級
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<CrmInvoiceDO>()
+ .eq(CrmInvoiceDO::getId, id)
+ .eq(CrmInvoiceDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
+ .set(CrmInvoiceDO::getAuditStatus, status)
+ .set(CrmInvoiceDO::getReviewTime, LocalDateTime.now())
+ .set(CrmInvoiceDO::getReviewRemark, reviewRemark));
+ }
+
default PageResult<CrmInvoiceDO> selectPageByCustomerId(CrmInvoicePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<CrmInvoiceDO>()
.eq(CrmInvoiceDO::getCustomerId, reqVO.getCustomerId()) // 蹇呴』浼犻��
- .eqIfPresent(CrmInvoiceDO::getNo, reqVO.getNo())
+ .likeIfPresent(CrmInvoiceDO::getNo, reqVO.getNo())
.eqIfPresent(CrmInvoiceDO::getContractId, reqVO.getContractId())
.orderByDesc(CrmInvoiceDO::getId));
}
@@ -49,7 +116,8 @@
CrmInvoiceDO::getId, userId, pageReqVO.getSceneType());
// 鎷兼帴鑷韩鐨勬煡璇㈡潯浠�
query.selectAll(CrmInvoiceDO.class)
- .eqIfPresent(CrmInvoiceDO::getNo, pageReqVO.getNo())
+ .likeIfPresent(CrmInvoiceDO::getNo, pageReqVO.getNo())
+ .eqIfPresent(CrmInvoiceDO::getCustomerId, pageReqVO.getCustomerId())
.eqIfPresent(CrmInvoiceDO::getContractId, pageReqVO.getContractId())
.eqIfPresent(CrmInvoiceDO::getAuditStatus, pageReqVO.getAuditStatus())
.orderByDesc(CrmInvoiceDO::getId);
--
Gitblit v1.9.3