From 2c2994b7a998a9b324d96e4a6e19a42b35db88f8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 02 十一月 2022 15:18:44 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 51 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 edbd43a..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
@@ -6,6 +6,7 @@
 import com.dg.core.db.manual.pojo.QueryResults;
 import com.dg.core.db.manual.pojo.RecommendResult;
 import com.dg.core.db.manual.pojo.Search;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -23,7 +24,15 @@
      * @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);
 
     /**
      * 新增导办事务
@@ -50,7 +59,7 @@
      * 统计数量
      * @return
      */
-    public int countNum(String matterAndUser,String classifyGrade);
+    public int countNum(String keyword,String classifyGrade,List<String> ids);
 
     /**
      * 导办事务搜索
@@ -58,6 +67,14 @@
      * @return
      */
     QueryResults queryMatterNameList(IPage<Search> page, Integer state,Integer recommendSize, String keyWord);
+
+
+    /**
+     * 导办事务搜索(无分页用于小程序)
+     * @param keyWord
+     * @return
+     */
+    QueryResults queryMatterNameList(String keyWord);
 
     /**
      * 导办事务搜索统计数量
@@ -67,11 +84,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);
 
     /**
      *  根据查询时间查询导办事务
@@ -97,11 +122,33 @@
      * 导办事物列表(不分页)
      * @return
      */
-    List<TransactionEvent> selectList();
+    List<TransactionEvent> selectList(String keyWord);
 
     /**
      * 智能咨询
      * @return
      */
     RecommendResult smartConsulting(String keyWord);
+
+
+    /**
+     * 根据部门判断是否有事项名称重复
+     */
+    String selectDataIfExist(@Param("departmentId") String departmentId,
+                             @Param("matterName") String matterName);
+
+
+    /**
+     * 根据办事分类获取办事指南
+     */
+    List<String> selectclassifyId(String classifyId);
+
+
+    /**
+     * 根据分类筛选数据
+     * @param ids
+     * @return
+     */
+    List<TransactionEvent> selectClassifyList(List<String> ids);
+
 }

--
Gitblit v1.7.1