feat: 增加[客户行业、客户来源]等字段显示，重构代码

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java

@@ -142,7 +142,7 @@ public class CrmCustomerController {
             return java.util.Collections.emptyList();
         }
         // 1.1 获取创建人、负责人列表
-        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(list,
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertSetByFlatMap(list,
                 contact -> Stream.of(NumberUtils.parseLong(contact.getCreator()), contact.getOwnerUserId())));
         Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
         // 1.2 获取距离进入公海的时间

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/customer/CrmStatisticsCustomerByUserBaseRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -10,6 +11,7 @@ import lombok.Data;
 public class CrmStatisticsCustomerByUserBaseRespVO {
 
     @Schema(description = "负责人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @JsonIgnore
     private Long ownerUserId;
 
     @Schema(description = "负责人", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/customer/CrmStatisticsCustomerContractSummaryRespVO.java

@@ -1,13 +1,18 @@
 package cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
+
 @Schema(description = "管理后台 - CRM 客户转化率分析 VO")
 @Data
 public class CrmStatisticsCustomerContractSummaryRespVO {
@@ -24,20 +29,30 @@ public class CrmStatisticsCustomerContractSummaryRespVO {
     @Schema(description = "回款金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1200.00")
     private BigDecimal receivablePrice;
 
+    @Schema(description = "客户行业ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @JsonIgnore
+    private String industryId;
+
     @Schema(description = "客户行业", requiredMode = Schema.RequiredMode.REQUIRED, example = "金融")
-    private String customerType;
+    private String industryName;
+
+    @Schema(description = "客户来源ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @JsonIgnore
+    private String source;
 
     @Schema(description = "客户来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "外呼")
-    private String customerSource;
+    private String sourceName;
 
     @Schema(description = "负责人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @JsonIgnore
     private Long ownerUserId;
 
     @Schema(description = "负责人", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
     private String ownerUserName;
 
     @Schema(description = "创建人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    private Long creatorUserId;
+    @JsonIgnore
+    private String creatorUserId;
 
     @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "源码")
     private String creatorUserName;
@@ -46,6 +61,7 @@ public class CrmStatisticsCustomerContractSummaryRespVO {
     private LocalDateTime createTime;
 
     @Schema(description = "下单日期", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-02-02 00:00:00")
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
     private LocalDate orderDate;
 
 }

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/customer/CrmStatisticsCustomerSummaryByUserRespVO.java

@@ -16,9 +16,9 @@ public class CrmStatisticsCustomerSummaryByUserRespVO extends CrmStatisticsCusto
     private Integer customerDealCount = 0;
 
     @Schema(description = "合同总金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
-    private BigDecimal contractPrice = BigDecimal.valueOf(0);
+    private BigDecimal contractPrice = BigDecimal.ZERO;
 
     @Schema(description = "回款金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
-    private BigDecimal receivablePrice = BigDecimal.valueOf(0);
+    private BigDecimal receivablePrice = BigDecimal.ZERO;
 
 }

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
 import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.*;
 import cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsCustomerMapper;
 import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
@@ -19,9 +20,14 @@ import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
 
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.*;
 
 /**
  * CRM 客户分析 Service 实现类
@@ -68,16 +74,20 @@ public class CrmStatisticsCustomerServiceImpl implements CrmStatisticsCustomerSe
         final List<String> times = generateTimeSeries(reqVO.getTimes()[0], reqVO.getTimes()[1]);
 
         // 4. 合并统计数据
-        List<CrmStatisticsCustomerSummaryByDateRespVO> result = new ArrayList<>(times.size());
+        List<CrmStatisticsCustomerSummaryByDateRespVO> respVoList = new ArrayList<>(times.size());
-        final Map<String, Integer> customerCreateCountMap = convertMap(customerCreateCount, CrmStatisticsCustomerSummaryByDateRespVO::getTime, CrmStatisticsCustomerSummaryByDateRespVO::getCustomerCreateCount);
+        final Map<String, Integer> customerCreateCountMap = convertMap(customerCreateCount,
-        final Map<String, Integer> customerDealCountMap = convertMap(customerDealCount, CrmStatisticsCustomerSummaryByDateRespVO::getTime, CrmStatisticsCustomerSummaryByDateRespVO::getCustomerDealCount);
+            CrmStatisticsCustomerSummaryByDateRespVO::getTime,
-        times.forEach(time -> result.add(
+            CrmStatisticsCustomerSummaryByDateRespVO::getCustomerCreateCount);
+        final Map<String, Integer> customerDealCountMap = convertMap(customerDealCount,
+            CrmStatisticsCustomerSummaryByDateRespVO::getTime,
+            CrmStatisticsCustomerSummaryByDateRespVO::getCustomerDealCount);
+        times.forEach(time -> respVoList.add(
             new CrmStatisticsCustomerSummaryByDateRespVO().setTime(time)
                 .setCustomerCreateCount(customerCreateCountMap.getOrDefault(time, 0))
                 .setCustomerDealCount(customerDealCountMap.getOrDefault(time, 0))
         ));
 
-        return result;
+        return respVoList;
     }
 
     @Override
@@ -96,25 +106,33 @@ public class CrmStatisticsCustomerServiceImpl implements CrmStatisticsCustomerSe
         final List<CrmStatisticsCustomerSummaryByUserRespVO> receivablePrice = customerMapper.selectReceivablePriceGroupbyUser(reqVO);
 
         // 3. 合并统计数据
-        final Map<Long, Integer> customerCreateCountMap = convertMap(customerCreateCount, CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId, CrmStatisticsCustomerSummaryByUserRespVO::getCustomerCreateCount);
+        final Map<Long, Integer> customerCreateCountMap = convertMap(customerCreateCount,
-        final Map<Long, Integer> customerDealCountMap = convertMap(customerDealCount, CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId, CrmStatisticsCustomerSummaryByUserRespVO::getCustomerDealCount);
+            CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId,
-        final Map<Long, BigDecimal> contractPriceMap = convertMap(contractPrice, CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId, CrmStatisticsCustomerSummaryByUserRespVO::getContractPrice);
+            CrmStatisticsCustomerSummaryByUserRespVO::getCustomerCreateCount);
-        final Map<Long, BigDecimal> receivablePriceMap = convertMap(receivablePrice, CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId, CrmStatisticsCustomerSummaryByUserRespVO::getReceivablePrice);
+        final Map<Long, Integer> customerDealCountMap = convertMap(customerDealCount,
-        List<CrmStatisticsCustomerSummaryByUserRespVO> result = new ArrayList<>(userIds.size());
+            CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId,
+            CrmStatisticsCustomerSummaryByUserRespVO::getCustomerDealCount);
+        final Map<Long, BigDecimal> contractPriceMap = convertMap(contractPrice,
+            CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId,
+            CrmStatisticsCustomerSummaryByUserRespVO::getContractPrice);
+        final Map<Long, BigDecimal> receivablePriceMap = convertMap(receivablePrice,
+            CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId,
+            CrmStatisticsCustomerSummaryByUserRespVO::getReceivablePrice);
+        List<CrmStatisticsCustomerSummaryByUserRespVO> respVoList = new ArrayList<>(userIds.size());
         userIds.forEach(userId -> {
-            final CrmStatisticsCustomerSummaryByUserRespVO respVO = new CrmStatisticsCustomerSummaryByUserRespVO();
+            final CrmStatisticsCustomerSummaryByUserRespVO vo = new CrmStatisticsCustomerSummaryByUserRespVO();
-            respVO.setOwnerUserId(userId);
+            vo.setOwnerUserId(userId);
-            respVO.setCustomerCreateCount(customerCreateCountMap.getOrDefault(userId, 0))
+            vo.setCustomerCreateCount(customerCreateCountMap.getOrDefault(userId, 0))
                 .setCustomerDealCount(customerDealCountMap.getOrDefault(userId, 0))
-                .setContractPrice(contractPriceMap.getOrDefault(userId, BigDecimal.valueOf(0)))
+                .setContractPrice(contractPriceMap.getOrDefault(userId, BigDecimal.ZERO))
-                .setReceivablePrice(receivablePriceMap.getOrDefault(userId, BigDecimal.valueOf(0)));
+                .setReceivablePrice(receivablePriceMap.getOrDefault(userId, BigDecimal.ZERO));
-            result.add(respVO);
+            respVoList.add(vo);
         });
 
         // 4. 拼接用户信息
-        appendUserInfo(result);
+        appendUserInfo(respVoList);
 
-        return result;
+        return respVoList;
     }
 
     @Override
@@ -136,16 +154,20 @@ public class CrmStatisticsCustomerServiceImpl implements CrmStatisticsCustomerSe
         final List<String> times = generateTimeSeries(reqVO.getTimes()[0], reqVO.getTimes()[1]);
 
         // 4. 合并统计数据
-        List<CrmStatisticsFollowupSummaryByDateRespVO> result = new ArrayList<>(times.size());
+        List<CrmStatisticsFollowupSummaryByDateRespVO> respVoList = new ArrayList<>(times.size());
-        final Map<String, Integer> followupRecordCountMap = convertMap(followupRecordCount, CrmStatisticsFollowupSummaryByDateRespVO::getTime, CrmStatisticsFollowupSummaryByDateRespVO::getFollowupRecordCount);
+        final Map<String, Integer> followupRecordCountMap = convertMap(followupRecordCount,
-        final Map<String, Integer> followupCustomerCountMap = convertMap(followupCustomerCount, CrmStatisticsFollowupSummaryByDateRespVO::getTime, CrmStatisticsFollowupSummaryByDateRespVO::getFollowupCustomerCount);
+            CrmStatisticsFollowupSummaryByDateRespVO::getTime,
-        times.forEach(time -> result.add(
+            CrmStatisticsFollowupSummaryByDateRespVO::getFollowupRecordCount);
+        final Map<String, Integer> followupCustomerCountMap = convertMap(followupCustomerCount,
+            CrmStatisticsFollowupSummaryByDateRespVO::getTime,
+            CrmStatisticsFollowupSummaryByDateRespVO::getFollowupCustomerCount);
+        times.forEach(time -> respVoList.add(
             new CrmStatisticsFollowupSummaryByDateRespVO().setTime(time)
                 .setFollowupRecordCount(followupRecordCountMap.getOrDefault(time, 0))
                 .setFollowupCustomerCount(followupCustomerCountMap.getOrDefault(time, 0))
         ));
 
-        return result;
+        return respVoList;
     }
 
     @Override
@@ -163,21 +185,25 @@ public class CrmStatisticsCustomerServiceImpl implements CrmStatisticsCustomerSe
         final List<CrmStatisticsFollowupSummaryByUserRespVO> followupCustomerCount = customerMapper.selectFollowupCustomerCountGroupbyUser(reqVO);
 
         // 3. 合并统计数据
-        final Map<Long, Integer> followupRecordCountMap = convertMap(followupRecordCount, CrmStatisticsFollowupSummaryByUserRespVO::getOwnerUserId, CrmStatisticsFollowupSummaryByUserRespVO::getFollowupRecordCount);
+        final Map<Long, Integer> followupRecordCountMap = convertMap(followupRecordCount,
-        final Map<Long, Integer> followupCustomerCountMap = convertMap(followupCustomerCount, CrmStatisticsFollowupSummaryByUserRespVO::getOwnerUserId, CrmStatisticsFollowupSummaryByUserRespVO::getFollowupCustomerCount);
+            CrmStatisticsFollowupSummaryByUserRespVO::getOwnerUserId,
-        List<CrmStatisticsFollowupSummaryByUserRespVO> result = new ArrayList<>(userIds.size());
+            CrmStatisticsFollowupSummaryByUserRespVO::getFollowupRecordCount);
+        final Map<Long, Integer> followupCustomerCountMap = convertMap(followupCustomerCount,
+            CrmStatisticsFollowupSummaryByUserRespVO::getOwnerUserId,
+            CrmStatisticsFollowupSummaryByUserRespVO::getFollowupCustomerCount);
+        List<CrmStatisticsFollowupSummaryByUserRespVO> respVoList = new ArrayList<>(userIds.size());
         userIds.forEach(userId -> {
-            final CrmStatisticsFollowupSummaryByUserRespVO stat = new CrmStatisticsFollowupSummaryByUserRespVO()
+            final CrmStatisticsFollowupSummaryByUserRespVO vo = new CrmStatisticsFollowupSummaryByUserRespVO()
                 .setFollowupRecordCount(followupRecordCountMap.getOrDefault(userId, 0))
                 .setFollowupCustomerCount(followupCustomerCountMap.getOrDefault(userId, 0));
-            stat.setOwnerUserId(userId);
+            vo.setOwnerUserId(userId);
-            result.add(stat);
+            respVoList.add(vo);
         });
 
         // 4. 拼接用户信息
-        appendUserInfo(result);
+        appendUserInfo(respVoList);
 
-        return result;
+        return respVoList;
     }
 
     @Override
@@ -191,16 +217,17 @@ public class CrmStatisticsCustomerServiceImpl implements CrmStatisticsCustomerSe
 
         // 2. 获得排行数据
         reqVO.setBizType(CrmBizTypeEnum.CRM_CUSTOMER.getType());
-        List<CrmStatisticsFollowupSummaryByTypeRespVO> stats = customerMapper.selectFollowupRecordCountGroupbyType(reqVO);
+        List<CrmStatisticsFollowupSummaryByTypeRespVO> respVoList = customerMapper.selectFollowupRecordCountGroupbyType(reqVO);
 
         // 3. 获取字典数据
-        List<DictDataRespDTO> followUpTypes = dictDataApi.getDictDataList("crm_follow_up_type");
+        List<DictDataRespDTO> followUpTypes = dictDataApi.getDictDataList(CRM_FOLLOW_UP_TYPE);
-        final Map<String, String> followUpTypeMap = convertMap(followUpTypes, DictDataRespDTO::getValue, DictDataRespDTO::getLabel);
+        final Map<String, String> followUpTypeMap = convertMap(followUpTypes,
-        stats.forEach(stat -> {
+            DictDataRespDTO::getValue, DictDataRespDTO::getLabel);
-            stat.setFollowupType(followUpTypeMap.get(stat.getFollowupType()));
+        respVoList.forEach(vo -> {
+            vo.setFollowupType(followUpTypeMap.get(vo.getFollowupType()));
         });
 
-        return stats;
+        return respVoList;
     }
 
     @Override
@@ -212,17 +239,29 @@ public class CrmStatisticsCustomerServiceImpl implements CrmStatisticsCustomerSe
         }
         reqVO.setUserIds(userIds);
 
-        List<CrmStatisticsCustomerContractSummaryRespVO> contractSummary = customerMapper.selectContractSummary(reqVO);
+        // 2. 获取统计数据
+        List<CrmStatisticsCustomerContractSummaryRespVO> respVoList = customerMapper.selectContractSummary(reqVO);
 
-        // 2. 拼接用户信息
+        // 3. 设置 创建人、负责人、行业、来源
-        final Set<Long> userIdSet = new HashSet<>();
+        // 获取客户所属行业
-        userIdSet.addAll(userIds);
+        Map<String, String> industryMap = convertMap(dictDataApi.getDictDataList(CRM_CUSTOMER_INDUSTRY),
-        userIdSet.addAll(convertSet(contractSummary, CrmStatisticsCustomerContractSummaryRespVO::getCreatorUserId));
+            DictDataRespDTO::getValue, DictDataRespDTO::getLabel);
-        final Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIdSet);
+        // 获取客户来源
-        contractSummary.forEach(contract -> contract.setCreatorUserName(userMap.get(contract.getCreatorUserId()).getNickname())
+        Map<String, String> sourceMap = convertMap(dictDataApi.getDictDataList(CRM_CUSTOMER_SOURCE),
-            .setOwnerUserName(userMap.get(contract.getOwnerUserId()).getNickname()));
+            DictDataRespDTO::getValue, DictDataRespDTO::getLabel);
+        // 获取创建人、负责人列表
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertSetByFlatMap(respVoList,
+            vo -> Stream.of(NumberUtils.parseLong(vo.getCreatorUserId()), vo.getOwnerUserId())));
 
-        return contractSummary;
+        respVoList.forEach(vo -> {
+            MapUtils.findAndThen(industryMap, vo.getIndustryId(), vo::setIndustryName);
+            MapUtils.findAndThen(sourceMap, vo.getSource(), vo::setSourceName);
+            MapUtils.findAndThen(userMap, NumberUtils.parseLong(vo.getCreatorUserId()),
+                user -> vo.setCreatorUserName(user.getNickname()));
+            MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user -> vo.setOwnerUserName(user.getNickname()));
+        });
+
+        return respVoList;
     }
 
     @Override
@@ -243,14 +282,16 @@ public class CrmStatisticsCustomerServiceImpl implements CrmStatisticsCustomerSe
         final List<String> times = generateTimeSeries(reqVO.getTimes()[0], reqVO.getTimes()[1]);
 
         // 4. 合并统计数据
-        List<CrmStatisticsCustomerDealCycleByDateRespVO> result = new ArrayList<>(times.size());
+        List<CrmStatisticsCustomerDealCycleByDateRespVO> respVoList = new ArrayList<>(times.size());
-        final Map<String, Double> customerDealCycleMap = convertMap(customerDealCycle, CrmStatisticsCustomerDealCycleByDateRespVO::getTime, CrmStatisticsCustomerDealCycleByDateRespVO::getCustomerDealCycle);
+        final Map<String, Double> customerDealCycleMap = convertMap(customerDealCycle,
-        times.forEach(time -> result.add(
+            CrmStatisticsCustomerDealCycleByDateRespVO::getTime,
+            CrmStatisticsCustomerDealCycleByDateRespVO::getCustomerDealCycle);
+        times.forEach(time -> respVoList.add(
             new CrmStatisticsCustomerDealCycleByDateRespVO().setTime(time)
-                .setCustomerDealCycle(customerDealCycleMap.getOrDefault(time, Double.valueOf(0)))
+                .setCustomerDealCycle(customerDealCycleMap.getOrDefault(time, 0D))
         ));
 
-        return result;
+        return respVoList;
     }
 
     @Override
@@ -268,33 +309,37 @@ public class CrmStatisticsCustomerServiceImpl implements CrmStatisticsCustomerSe
         final List<CrmStatisticsCustomerSummaryByUserRespVO> customerDealCount = customerMapper.selectCustomerDealCountGroupbyUser(reqVO);
 
         // 3. 合并统计数据
-        final Map<Long, Double> customerDealCycleMap = convertMap(customerDealCycle, CrmStatisticsCustomerDealCycleByUserRespVO::getOwnerUserId, CrmStatisticsCustomerDealCycleByUserRespVO::getCustomerDealCycle);
+        final Map<Long, Double> customerDealCycleMap = convertMap(customerDealCycle,
-        final Map<Long, Integer> customerDealCountMap = convertMap(customerDealCount, CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId, CrmStatisticsCustomerSummaryByUserRespVO::getCustomerDealCount);
+            CrmStatisticsCustomerDealCycleByUserRespVO::getOwnerUserId,
-        List<CrmStatisticsCustomerDealCycleByUserRespVO> result = new ArrayList<>(userIds.size());
+            CrmStatisticsCustomerDealCycleByUserRespVO::getCustomerDealCycle);
+        final Map<Long, Integer> customerDealCountMap = convertMap(customerDealCount,
+            CrmStatisticsCustomerSummaryByUserRespVO::getOwnerUserId,
+            CrmStatisticsCustomerSummaryByUserRespVO::getCustomerDealCount);
+        List<CrmStatisticsCustomerDealCycleByUserRespVO> respVoList = new ArrayList<>(userIds.size());
         userIds.forEach(userId -> {
-            final CrmStatisticsCustomerDealCycleByUserRespVO stat = new CrmStatisticsCustomerDealCycleByUserRespVO()
+            final CrmStatisticsCustomerDealCycleByUserRespVO vo = new CrmStatisticsCustomerDealCycleByUserRespVO()
                 .setCustomerDealCycle(customerDealCycleMap.getOrDefault(userId, 0.0))
                 .setCustomerDealCount(customerDealCountMap.getOrDefault(userId, 0));
-            stat.setOwnerUserId(userId);
+            vo.setOwnerUserId(userId);
-            result.add(stat);
+            respVoList.add(vo);
         });
 
         // 4. 拼接用户信息
-        appendUserInfo(result);
+        appendUserInfo(respVoList);
 
-        return result;
+        return respVoList;
     }
 
     /**
      * 拼接用户信息（昵称）
      *
-     * @param stats 统计数据
+     * @param respVoList 统计数据
      */
-    private <T extends CrmStatisticsCustomerByUserBaseRespVO> void appendUserInfo(List<T> stats) {
+    private <T extends CrmStatisticsCustomerByUserBaseRespVO> void appendUserInfo(List<T> respVoList) {
-        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertSet(stats, CrmStatisticsCustomerByUserBaseRespVO::getOwnerUserId));
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertSet(respVoList,
-        stats.forEach(stat -> MapUtils.findAndThen(userMap, stat.getOwnerUserId(), user -> {
+            CrmStatisticsCustomerByUserBaseRespVO::getOwnerUserId));
-            stat.setOwnerUserName(user.getNickname());
+        respVoList.forEach(vo -> MapUtils.findAndThen(userMap,
-        }));
+            vo.getOwnerUserId(), user -> vo.setOwnerUserName(user.getNickname())));
     }
 
     /**

yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml

@@ -180,8 +180,10 @@
         SELECT
         a.`name` AS customer_name,
         b.`name` AS contract_name,
-        b.total_price AS contract_price,
+        b.total_price,
         IFNULL( c.price, 0 ) AS receivable_price,
+        a.industry_id,
+        a.source,
         a.owner_user_id,
         a.creator AS creator_user_id,
         a.create_time,