From c7a1a16c8d22b64f9025e800ebaf89b19b530228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 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 c52eebf..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);
/**
* 导办事务搜索
@@ -113,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