From 2d28d91d6ca70f8b60a24f6807ff1a2d1e117eb2 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 11:16:09 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 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 c52eebf..1ad5857 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 matterAndUser, String classifyGrade,
+                                                   List<String> ids);
+
+    /**
+     * 导办事物列表
+     * @return
+     */
+    public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade,
+                                                   List<String> ids);
 
     /**
      * 新增导办事务
@@ -50,7 +59,7 @@
      * 统计数量
      * @return
      */
-    public int countNum(String matterAndUser,String classifyGrade);
+    public int countNum(String matterAndUser,String classifyGrade,List<String> ids);
 
     /**
      * 导办事务搜索
@@ -120,4 +129,19 @@
      * @return
      */
     RecommendResult smartConsulting(String keyWord);
+
+
+    /**
+     * 根据部门判断是否有事项名称重复
+     */
+    String selectDataIfExist(@Param("departmentId") String departmentId,
+                             @Param("matterName") String matterName);
+
+
+    /**
+     * 根据办事分类获取办事指南
+     */
+    List<String> selectclassifyId(String classifyId);
+
+
 }

--
Gitblit v1.7.1