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/contract/CrmContractMapper.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 101 insertions(+), 2 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
index b85d74c..c5b2327 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.crm.dal.mysql.contract;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
@@ -12,6 +13,7 @@
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmSceneTypeEnum;
import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
import java.math.BigDecimal;
@@ -26,8 +28,81 @@
@Mapper
public interface CrmContractMapper extends BaseMapperX<CrmContractDO> {
+ default CrmContractDO selectByNoForUpdate(String no) {
+ return selectOne(new LambdaQueryWrapperX<CrmContractDO>().eq(CrmContractDO::getNo, no).last("FOR UPDATE"));
+ }
+
+ default CrmContractDO selectByIdForUpdate(Long id) {
+ return selectOne(new LambdaQueryWrapperX<CrmContractDO>().eq(CrmContractDO::getId, id).last("FOR UPDATE"));
+ }
default CrmContractDO selectByNo(String no) {
return selectOne(CrmContractDO::getNo, no);
+ }
+
+ default CrmContractDO selectByNameAndCustomerId(String name, Long customerId) {
+ return selectOne(new LambdaQueryWrapperX<CrmContractDO>()
+ .eq(CrmContractDO::getName, name)
+ .eq(CrmContractDO::getCustomerId, customerId));
+ }
+
+ /**
+ * 鎻愪氦瀹℃壒锛氱疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ *
+ * 涔嬫墍浠ョ敤 UpdateWrapper 鑰岄潪 updateById锛歁yBatis-Plus 榛樿鐨勫瓧娈垫洿鏂扮瓥鐣ヤ細蹇界暐 null锛�
+ * 鐩存帴 updateById 鏃犳硶鎶婂鏍镐笉閫氳繃鍚庢畫鐣欑殑瀹℃牳浜恒�佸鏍告椂闂淬�佸鏍告剰瑙佺湡姝ｆ竻绌恒��
+ *
+ * @param id 鍚堝悓缂栧彿
+ * @param status 鐩爣鐘舵�侊紙瀹℃壒涓級
+ * @return 褰卞搷琛屾暟
+ */
+ default int submitAndResetAuditInfo(Long id, Integer status) {
+ return update(null, new LambdaUpdateWrapper<CrmContractDO>()
+ .eq(CrmContractDO::getId, id)
+ .in(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.DRAFT.getStatus(),
+ CrmAuditStatusEnum.REJECT.getStatus())
+ .set(CrmContractDO::getAuditStatus, status)
+ .set(CrmContractDO::getReviewerId, null)
+ .set(CrmContractDO::getReviewerName, null)
+ .set(CrmContractDO::getReviewTime, null)
+ .set(CrmContractDO::getReviewRemark, null));
+ }
+
+ /**
+ * 瀹℃牳锛氬啓鍏ュ鏍哥粨鏋溿�佸鏍镐汉涓庡鏍告剰瑙�
+ *
+ * reviewRemark 鍏佽涓� null锛堝鏍搁�氳繃鏃舵剰瑙佸彲閫夛級锛屾晠鍚屾牱浣跨敤 UpdateWrapper 鐩村啓銆�
+ *
+ * @param id 鍚堝悓缂栧彿
+ * @param status 鐩爣鐘舵�侊紙瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
+ * @param reviewerId 瀹℃牳浜虹紪鍙�
+ * @param reviewerName 瀹℃牳浜哄鍚�
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int auditContract(Long id, Integer status, Long reviewerId,
+ String reviewerName, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<CrmContractDO>()
+ .eq(CrmContractDO::getId, id)
+ .eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
+ .set(CrmContractDO::getAuditStatus, status)
+ .set(CrmContractDO::getReviewerId, reviewerId)
+ .set(CrmContractDO::getReviewerName, reviewerName)
+ .set(CrmContractDO::getReviewTime, LocalDateTime.now())
+ .set(CrmContractDO::getReviewRemark, reviewRemark));
+ }
+
+ /**
+ * BPM 瀹℃壒缁撴潫鍚庡洖鍐欏悎鍚岀姸鎬�
+ *
+ * 浠呭綋鍚堝悓浠嶅浜庛�屽鎵逛腑銆嶆椂鏇存柊锛岄伩鍏嶄笌鏃у鎵硅矾寰勯噸澶嶈鐩栥��
+ */
+ default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<CrmContractDO>()
+ .eq(CrmContractDO::getId, id)
+ .eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
+ .set(CrmContractDO::getAuditStatus, status)
+ .set(CrmContractDO::getReviewTime, LocalDateTime.now())
+ .set(CrmContractDO::getReviewRemark, reviewRemark));
}
default PageResult<CrmContractDO> selectPageByCustomerId(CrmContractPageReqVO pageReqVO) {
@@ -51,6 +126,18 @@
}
default PageResult<CrmContractDO> selectPage(CrmContractPageReqVO pageReqVO, Long userId, CrmContractConfigDO config) {
+ return selectPage(pageReqVO, userId, config, null);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ *
+ * @param pageReqVO 鏌ヨ鏉′欢
+ * @param userId 鐢ㄦ埛ID
+ * @param config 鍚堝悓閰嶇疆
+ * @param permittedCustomerIds 鏈夋潈闄愮殑瀹㈡埛ID鍒楄〃锛坣ull琛ㄧず涓嶉檺鍒讹級
+ */
+ default PageResult<CrmContractDO> selectPage(CrmContractPageReqVO pageReqVO, Long userId, CrmContractConfigDO config, List<Long> permittedCustomerIds) {
MPJLambdaWrapperX<CrmContractDO> query = new MPJLambdaWrapperX<>();
// 鎷兼帴鏁版嵁鏉冮檺鐨勬煡璇㈡潯浠�
CrmPermissionUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CONTRACT.getType(),
@@ -64,12 +151,22 @@
.eqIfPresent(CrmContractDO::getAuditStatus, pageReqVO.getAuditStatus())
.orderByDesc(CrmContractDO::getId);
+ // 瀹㈡埛鏉冮檺杩囨护
+ if (permittedCustomerIds != null) {
+ if (CollUtil.isEmpty(permittedCustomerIds)) {
+ return PageResult.empty();
+ }
+ query.in(CrmContractDO::getCustomerId, permittedCustomerIds);
+ }
+
// Backlog: 鍗冲皢鍒版湡鐨勫悎鍚�
LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());
if (CrmContractPageReqVO.EXPIRY_TYPE_ABOUT_TO_EXPIRE.equals(pageReqVO.getExpiryType())) { // 鍗冲皢鍒版湡
query.eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.APPROVE.getStatus())
- .between(CrmContractDO::getEndTime, beginOfToday, endOfToday.plusDays(config.getNotifyDays()));
+ // notifyDays 鍙兘涓� null锛堝巻鍙查厤缃湭濉級锛屼负 null 鏃舵寜 0 澶╁鐞嗭紝閬垮厤鎷嗙 NPE
+ .between(CrmContractDO::getEndTime, beginOfToday,
+ endOfToday.plusDays(config.getNotifyDays() != null ? config.getNotifyDays() : 0));
} else if (CrmContractPageReqVO.EXPIRY_TYPE_EXPIRED.equals(pageReqVO.getExpiryType())) { // 宸插埌鏈�
query.eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.APPROVE.getStatus())
.lt(CrmContractDO::getEndTime, endOfToday);
@@ -104,7 +201,9 @@
LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());
query.eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.APPROVE.getStatus()) // 蹇呴』瀹℃壒閫氳繃锛�
- .between(CrmContractDO::getEndTime, beginOfToday, endOfToday.plusDays(config.getNotifyDays()));
+ // notifyDays 鍙兘涓� null锛堝巻鍙查厤缃湭濉級锛屼负 null 鏃舵寜 0 澶╁鐞嗭紝閬垮厤鎷嗙 NPE
+ .between(CrmContractDO::getEndTime, beginOfToday,
+ endOfToday.plusDays(config.getNotifyDays() != null ? config.getNotifyDays() : 0));
return selectCount(query);
}
--
Gitblit v1.9.3