From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
index 8169887..c7c6a7f 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
@@ -15,8 +15,10 @@
import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer.*;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerPoolConfigDO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerProgressDO;
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerPoolConfigService;
+import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerProgressService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -61,6 +63,8 @@
private CrmCustomerPoolConfigService customerPoolConfigService;
@Resource
private CrmContractService contractService;
+ @Resource
+ private CrmCustomerProgressService customerProgressService;
@Resource
private DeptApi deptApi;
@@ -167,6 +171,8 @@
Set<Long> customerIds = convertSet(list, CrmCustomerDO::getId);
Map<Long, Long> contractCountMap = contractService.getContractCountMapByCustomerIds(customerIds);
Map<Long, BigDecimal> contractPriceMap = contractService.getContractPriceMapByCustomerIds(customerIds);
+ // 1.4 鑾峰彇姣忎釜瀹㈡埛鏈�鏂扮殑涓�鏉℃唇璋堣繘搴︼紙瀹㈡埛瀵煎嚭鏃跺甫鍑猴級
+ Map<Long, CrmCustomerProgressDO> latestProgressMap = customerProgressService.getLatestProgressMap(customerIds);
// 2. 杞崲鎴� VO
return BeanUtils.toBean(list, CrmCustomerRespVO.class, customerVO -> {
customerVO.setAreaName(AreaUtils.format(customerVO.getAreaId()));
@@ -185,6 +191,9 @@
customerVO.setContractCount(
contractCountMap.getOrDefault(customerVO.getId(), 0L).intValue());
customerVO.setContractTotalPrice(contractPriceMap.get(customerVO.getId()));
+ // 2.4 璁剧疆鏈�鏂版唇璋堣繘搴�
+ MapUtils.findAndThen(latestProgressMap, customerVO.getId(),
+ progress -> customerVO.setNegotiationProgress(progress.getContent()));
});
}
--
Gitblit v1.9.3