From a647bc8a43c0212f482bee0630ebd14dca120a8a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 28 九月 2026 14:13:28 +0800
Subject: [PATCH] feat: CRM 发票/合同导入、MES 质检批量导入与检测台账、回款与报价校验、权限码细化
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/quotation/CrmSaleQuotationMapper.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/quotation/CrmSaleQuotationMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/quotation/CrmSaleQuotationMapper.java
index f43e8b1..b9177b6 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/quotation/CrmSaleQuotationMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/quotation/CrmSaleQuotationMapper.java
@@ -1,9 +1,11 @@
package cn.iocoder.yudao.module.crm.dal.mysql.quotation;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationPageReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationDO;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
@@ -11,13 +13,14 @@
import cn.iocoder.yudao.module.crm.enums.quotation.CrmSaleQuotationStatusEnum;
import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* CRM 閿�鍞姤浠峰崟 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface CrmSaleQuotationMapper extends BaseMapperX<CrmSaleQuotationDO> {
@@ -26,7 +29,25 @@
return selectOne(CrmSaleQuotationDO::getNo, no);
}
+ /**
+ * 鎸夋姤浠峰崟鍙锋煡璇㈣褰曪紙涓嶈繃婊ら�昏緫鍒犻櫎锛屽惈宸插垹闄よ锛�
+ * 鐢ㄤ簬鑷畾涔夊崟鍙风殑鍞竴鎬ч鏍￠獙锛歶k_no 鍞竴绱㈠紩瑕嗙洊宸插垹闄よ锛岄渶涓�璧峰垽鏂墠鑳界粰鍑哄彲璇绘彁绀�
+ */
+ @Select("SELECT * FROM crm_sale_quotation WHERE no = #{no} LIMIT 1")
+ CrmSaleQuotationDO selectAnyByNo(String no);
+
default PageResult<CrmSaleQuotationDO> selectPage(CrmSaleQuotationPageReqVO pageReqVO, Long userId) {
+ return selectPage(pageReqVO, userId, null);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ *
+ * @param pageReqVO 鏌ヨ鏉′欢
+ * @param userId 鐢ㄦ埛ID
+ * @param permittedCustomerIds 鏈夋潈闄愮殑瀹㈡埛ID鍒楄〃锛坣ull琛ㄧず涓嶉檺鍒讹級
+ */
+ default PageResult<CrmSaleQuotationDO> selectPage(CrmSaleQuotationPageReqVO pageReqVO, Long userId, List<Long> permittedCustomerIds) {
MPJLambdaWrapperX<CrmSaleQuotationDO> query = new MPJLambdaWrapperX<>();
// 鎷兼帴鏁版嵁鏉冮檺鐨勬煡璇㈡潯浠�
CrmPermissionUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_SALE_QUOTATION.getType(),
@@ -39,6 +60,15 @@
.eqIfPresent(CrmSaleQuotationDO::getBusinessId, pageReqVO.getBusinessId())
.eqIfPresent(CrmSaleQuotationDO::getStatus, pageReqVO.getStatus())
.orderByDesc(CrmSaleQuotationDO::getId);
+
+ // 瀹㈡埛鏉冮檺杩囨护
+ if (permittedCustomerIds != null) {
+ if (CollUtil.isEmpty(permittedCustomerIds)) {
+ return PageResult.empty();
+ }
+ query.in(CrmSaleQuotationDO::getCustomerId, permittedCustomerIds);
+ }
+
return selectJoinPage(pageReqVO, CrmSaleQuotationDO.class, query);
}
@@ -74,4 +104,17 @@
return selectCount(CrmSaleQuotationDO::getCustomerId, customerId);
}
+ /**
+ * 娓呴櫎鎶ヤ环鍗曠殑鍚堝悓鍏宠仈锛堝垹闄ゅ悎鍚屾椂璋冪敤锛�
+ *
+ * @param quotationId 鎶ヤ环鍗曠紪鍙�
+ */
+ default void clearContractReference(Long quotationId) {
+ update(new LambdaUpdateWrapper<CrmSaleQuotationDO>()
+ .eq(CrmSaleQuotationDO::getId, quotationId)
+ .set(CrmSaleQuotationDO::getContractId, null)
+ .set(CrmSaleQuotationDO::getStatus,0)
+ .set(CrmSaleQuotationDO::getContractNo, null));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3