From d498f693733a107e5f6e8fa2e8df7591b4924af1 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 10:46:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
index f12a26e..9aa31e6 100644
--- a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
@@ -7,6 +7,7 @@
 import com.dg.core.db.manual.pojo.RecommendResult;
 import com.dg.core.db.manual.pojo.Search;
 import org.springframework.data.repository.query.Param;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -122,7 +123,7 @@
      * 导办事物列表(不分页)
      * @return
      */
-    List<TransactionEvent> selectList();
+    List<TransactionEvent> selectList(String keyWord);
 
     /**
      * 智能咨询
@@ -144,4 +145,12 @@
     List<String> selectclassifyId(String classifyId);
 
 
+    /**
+     * 根据分类筛选数据
+     * @param ids
+     * @return
+     */
+    List<TransactionEvent> selectClassifyList(List<String> ids);
+    Integer batchImport(String fileName, MultipartFile file) ;
+
 }

--
Gitblit v1.7.1