Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

5 天以前 539624ef39177ebb6fd5577b83df7097dd6f4bec

 src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java

@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.pojo.CustomerFollowUp;
import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import org.springframework.web.multipart.MultipartFile;

import java.util.Collection;
import java.util.List;

/**
@@ -41,7 +43,7 @@
    /**
     * 添加跟进附件
     */
    void addFollowUpFiles(List<MultipartFile> files, Integer followUpId);
    List<CustomerFollowUpFileDto> addFollowUpFiles(List<MultipartFile> files, Integer followUpId);

    /**
     * 删除跟进附件
@@ -49,6 +51,11 @@
    void deleteFollowUpFile(Integer fileId);

    /**
     * 根据附件ID集合获取附件列表
     */
    List<CustomerFollowUpFile> getFollowUpFilesByIds(Collection<Long> fileIds);

    /**
     * 获取跟进详情
     */
    CustomerFollowUpDto getFollowUpWithFiles(Integer id);