From 5ea995912d4134f2027a3ddb566718f56d979261 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 三月 2026 16:49:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java b/src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java
index 25b5809..24992f7 100644
--- a/src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java
+++ b/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);
--
Gitblit v1.9.3