From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 1ad5857..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;
@@ -24,14 +25,14 @@
* @return
*/
public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
- String matterAndUser, String classifyGrade,
+ String keyword, String classifyGrade,
List<String> ids);
/**
* 导办事物列表
* @return
*/
- public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade,
+ public List<TransactionEvent> selectConfigList(String keyword, String classifyGrade,
List<String> ids);
/**
@@ -59,7 +60,7 @@
* 统计数量
* @return
*/
- public int countNum(String matterAndUser,String classifyGrade,List<String> ids);
+ public int countNum(String keyword,String classifyGrade,List<String> ids);
/**
* 导办事务搜索
@@ -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