From fc712449840c929022e5ad61102a0709c353dd63 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 09 三月 2026 17:46:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
index 48cbddb..f0e4716 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
@@ -1,10 +1,22 @@
package com.ruoyi.basic.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.stream.CollectorUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
import com.ruoyi.basic.mapper.CustomerFollowUpFileMapper;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
+import com.ruoyi.basic.service.CustomerFollowUpService;
+import com.ruoyi.common.vo.SimpleFileVo;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* <br>
@@ -16,5 +28,47 @@
* @since 2026/03/04 14:53
*/
@Service
+@RequiredArgsConstructor
public class CustomerFollowUpFileServiceImpl extends ServiceImpl<CustomerFollowUpFileMapper, CustomerFollowUpFile> implements CustomerFollowUpFileService {
+
+ private final CustomerFollowUpService customerFollowUpService;
+
+
+ @Override
+ public <T> void fillAttachment(List<T> list, Function<T, String> getAttachmentIds, BiConsumer<T, List<SimpleFileVo>> setAttachmentList) {
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ // 鏀堕泦鎵�鏈夋枃浠禝D
+ Set<Long> ids = list.stream()
+ .map(getAttachmentIds)
+ .filter(StrUtil::isNotBlank)
+ .flatMap(s -> Arrays.stream(s.split(",")))
+ .map(Long::valueOf)
+ .collect(Collectors.toSet());
+ List<CustomerFollowUpFile> followUpFilesByIds = new ArrayList<>();
+ Lists.partition(Lists.newArrayList(ids), 999).forEach(it -> {
+ followUpFilesByIds.addAll(
+ customerFollowUpService.getFollowUpFilesByIds(it)
+ );
+ });
+ if (CollUtil.isEmpty(followUpFilesByIds)) {
+ return;
+ }
+ Map<Long, SimpleFileVo> collectMap = followUpFilesByIds.stream().map(SimpleFileVo::convert).collect(Collectors.toMap(
+ SimpleFileVo::getId,
+ Function.identity()
+ ));
+ list.forEach(t -> {
+ String attachmentIds = getAttachmentIds.apply(t);
+ if (StrUtil.isNotBlank(attachmentIds)) {
+ List<SimpleFileVo> fileVos = Arrays.stream(attachmentIds.split(","))
+ .map(Long::valueOf)
+ .map(it->collectMap.getOrDefault(it, null))
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ setAttachmentList.accept(t, fileVos);
+ }
+ });
+ }
}
--
Gitblit v1.9.3