From fd68c25ee4890f298c4bce1c2e4da97b6a70a402 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 03 十一月 2022 16:28:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 a318923..3262c8d 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
@@ -24,7 +24,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 keyword, String classifyGrade,
                                                    List<String> ids);
 
     /**
@@ -52,7 +59,7 @@
      * 统计数量
      * @return
      */
-    public int countNum(String matterAndUser,String classifyGrade,List<String> ids);
+    public int countNum(String keyword,String classifyGrade,List<String> ids);
 
     /**
      * 导办事务搜索
@@ -115,7 +122,7 @@
      * 导办事物列表(不分页)
      * @return
      */
-    List<TransactionEvent> selectList();
+    List<TransactionEvent> selectList(String keyWord);
 
     /**
      * 智能咨询
@@ -137,4 +144,11 @@
     List<String> selectclassifyId(String classifyId);
 
 
+    /**
+     * 根据分类筛选数据
+     * @param ids
+     * @return
+     */
+    List<TransactionEvent> selectClassifyList(List<String> ids);
+
 }

--
Gitblit v1.7.1