From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 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 edbd43a..0c36de8 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
@@ -23,7 +23,8 @@
      * @return
      */
     public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
-                                                   String matterAndUser, String classifyGrade);
+                                                   String matterAndUser, String classifyGrade,
+                                                   List<String> ids);
 
     /**
      * 新增导办事务
@@ -50,7 +51,7 @@
      * 统计数量
      * @return
      */
-    public int countNum(String matterAndUser,String classifyGrade);
+    public int countNum(String matterAndUser,String classifyGrade,List<String> ids);
 
     /**
      * 导办事务搜索
@@ -58,6 +59,14 @@
      * @return
      */
     QueryResults queryMatterNameList(IPage<Search> page, Integer state,Integer recommendSize, String keyWord);
+
+
+    /**
+     * 导办事务搜索(无分页用于小程序)
+     * @param keyWord
+     * @return
+     */
+    QueryResults queryMatterNameList(String keyWord);
 
     /**
      * 导办事务搜索统计数量
@@ -67,11 +76,19 @@
     int countNumByMatterName(String matterName);
 
     /**
-     *  根据分离查询导办事务
+     *  根据分类id查询导办事务
      * @param classifyId
      * @return
      */
     List<TransactionEvent> queryByClassifyIdList(String classifyId,Integer departmentId);
+
+
+    /**
+     *  根据分类id查询导办事务(分页)
+     * @param classifyId
+     * @return
+     */
+    List<TransactionEvent> queryByClassifyIdList(IPage<TransactionEvent> page, Integer state,String classifyId,Integer departmentId);
 
     /**
      *  根据查询时间查询导办事务
@@ -104,4 +121,11 @@
      * @return
      */
     RecommendResult smartConsulting(String keyWord);
+
+
+    /**
+     * 获取统计数据  首页用  勿动
+     */
+    int countStatisticsNum(List<String> classifyIds);
+
 }

--
Gitblit v1.7.1