From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 34388df..7953ac0 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
@@ -35,8 +35,10 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -139,9 +141,16 @@
Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
// 1.2 鑾峰彇璺濈杩涘叆鍏捣鐨勬椂闂�
Map<Long, Long> poolDayMap = getPoolDayMap(list);
+ // 1.3 鑾峰彇鎵�灞炰笂绾х粡閿�鍟嗗悕绉�
+ Set<Long> parentDealerIds = convertSet(list, CrmCustomerDO::getParentDealerId);
+ parentDealerIds.remove(null);
+ Map<Long, CrmCustomerDO> parentDealerMap = CollUtil.isEmpty(parentDealerIds)
+ ? Collections.emptyMap() : customerService.getCustomerMap(parentDealerIds);
// 2. 杞崲鎴� VO
return BeanUtils.toBean(list, CrmCustomerRespVO.class, customerVO -> {
customerVO.setAreaName(AreaUtils.format(customerVO.getAreaId()));
+ MapUtils.findAndThen(parentDealerMap, customerVO.getParentDealerId(),
+ dealer -> customerVO.setParentDealerName(dealer.getName()));
// 2.1 璁剧疆鍒涘缓浜恒�佽礋璐ｄ汉鍚嶇О
MapUtils.findAndThen(userMap, NumberUtils.parseLong(customerVO.getCreator()),
user -> customerVO.setCreatorName(user.getNickname()));
@@ -249,7 +258,7 @@
public void importTemplate(HttpServletResponse response) throws IOException {
// 鎵嬪姩鍒涘缓瀵煎嚭 demo
List<CrmCustomerImportExcelVO> list = Arrays.asList(
- CrmCustomerImportExcelVO.builder().name("鑺嬮亾").industryId(1).level(1).source(1)
+ CrmCustomerImportExcelVO.builder().name("瓒呯骇绠＄悊鍛�").industryId(1).level(1).source(1)
.mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn")
.areaId(null).detailAddress("").remark("").build(),
CrmCustomerImportExcelVO.builder().name("婧愮爜").industryId(1).level(1).source(1)
--
Gitblit v1.9.3