From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 24 ++++++++++++++++++++----
1 files changed, 20 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 0c36de8..f12a26e 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,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);
/**
@@ -51,7 +59,7 @@
* 统计数量
* @return
*/
- public int countNum(String matterAndUser,String classifyGrade,List<String> ids);
+ public int countNum(String keyword,String classifyGrade,List<String> ids);
/**
* 导办事务搜索
@@ -124,8 +132,16 @@
/**
- * 获取统计数据 首页用 勿动
+ * 根据部门判断是否有事项名称重复
*/
- int countStatisticsNum(List<String> classifyIds);
+ String selectDataIfExist(@Param("departmentId") String departmentId,
+ @Param("matterName") String matterName);
+
+
+ /**
+ * 根据办事分类获取办事指南
+ */
+ List<String> selectclassifyId(String classifyId);
+
}
--
Gitblit v1.7.1