buhuazhen
8 天以前 426d99944e8e87d3ad1ea1f9e5a3677d249a1413
feat(customer-follow-up): 增加批量填充附件列表功能

- 在 CustomerFollowUpFileService 接口新增泛型方法 fillAttachment,支持按附件ID批量查询并设置附件列表
- 实现 CustomerFollowUpFileServiceImpl 中 fillAttachment 方法,支持传入实体列表及获取和设置附件ID及附件列表的函数
- 优化根据附件ID集合查询附件接口,改用 Collection 作为参数类型,提升通用性
- 通过 customerFollowUpService 获取附件文件列表,转换为简单文件视图对象再填充到对应实体中
- 处理空列表和空附件ID情况,避免空指针异常和无效操作
已修改4个文件
75 ■■■■■ 文件已修改
src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java
@@ -2,6 +2,13 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.common.vo.SimpleFileVo;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Null;
import java.util.List;
import java.util.function.BiConsumer;
import java.util.function.Function;
/**
 * <br>
@@ -13,4 +20,18 @@
 * @since 2026/03/04 14:52
 */
public interface CustomerFollowUpFileService extends IService<CustomerFollowUpFile> {
    /**
     * 根据 xx,xxx,xx批量查询并且出插入SimpleFileVo进入
     * @param list
     * @param getAttachmentIds
     * @param setAttachmentList
     * @param <T>
     */
    <T> void fillAttachment(
           @Null List<T> list,
           @NotNull Function<T, String> getAttachmentIds,
           @NotNull BiConsumer<T, List<SimpleFileVo>> setAttachmentList
    );
}
src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java
@@ -7,6 +7,7 @@
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import org.springframework.web.multipart.MultipartFile;
import java.util.Collection;
import java.util.List;
/**
@@ -52,7 +53,7 @@
    /**
     * 根据附件ID集合获取附件列表
     */
    List<CustomerFollowUpFile> getFollowUpFilesByIds(List<Long> fileIds);
    List<CustomerFollowUpFile> getFollowUpFilesByIds(Collection<Long> fileIds);
    /**
     * 获取跟进详情
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
@@ -1,10 +1,21 @@
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.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 +27,42 @@
 * @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;
        }
        // 收集所有文件ID
        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 = customerFollowUpService.getFollowUpFilesByIds(ids);
        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, (SimpleFileVo) Collections.emptyList()))
                        .collect(Collectors.toList());
                setAttachmentList.accept(t, fileVos);
            }
        });
    }
}
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java
@@ -30,6 +30,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
@@ -141,7 +142,7 @@
    }
    @Override
    public List<CustomerFollowUpFile> getFollowUpFilesByIds(List<Long> fileIds) {
    public List<CustomerFollowUpFile> getFollowUpFilesByIds(Collection<Long> fileIds) {
        if (fileIds == null || fileIds.isEmpty()) {
            return new ArrayList<>(0);
        }