From 6a1a6dda565342de58e7ce70fb78e628e8493b0c Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 15 十一月 2022 18:04:24 +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/db/gen/mapper/TransactionEventMapper.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
index 2dd3e6f..02a63e6 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
@@ -24,7 +24,19 @@
* @return
*/
public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
- @Param("matterAndUser") String matterAndUser,
+ @Param("keyword") String keyword,
+ @Param("classifyGrade") String classifyGrade,
+ @Param("ids") List<String> ids);
+
+
+
+
+ /**
+ * 导办事物列表 (部分也)
+ * @param
+ * @return
+ */
+ public List<TransactionEvent> selectConfigList(@Param("keyword") String keyword,
@Param("classifyGrade") String classifyGrade,
@Param("ids") List<String> ids);
@@ -54,7 +66,7 @@
* @param
* @return
*/
- public int countNum(@Param("matterAndUser") String matterAndUser,
+ public int countNum(@Param("keyword") String keyword,
@Param("classifyGrade") String classifyGrade,
@Param("ids") List<String> ids);
@@ -70,7 +82,14 @@
* @param matterName
* @return
*/
- List<TransactionEvent> queryMatterNameList(String matterName);
+ List<TransactionEvent> queryMatterNameList(@Param("matterName") String matterName,@Param("classifyId") String classifyId);
+
+ /**
+ * 导办事务搜索(不带分页)(关联词)
+ * @param associateNames
+ * @return
+ */
+ List<TransactionEvent> queryAssociateNamesList(@Param("associateNames") String associateNames,@Param("classifyId") String classifyId);
/**
* 导办事务搜索统计数量
@@ -160,11 +179,31 @@
List<TransactionEvent> selectListByIds(String[] list);
/**
+ * 根据分类筛选数据
+ * @param ids
+ * @return
+ */
+ List<TransactionEvent> selectClassifyList(List<String> ids);
+
+ /**
* 根据部门判断是否有事项名称重复
*/
String selectDataIfExist(@Param("departmentId") String departmentId,
@Param("matterName") String matterName);
+ /**
+ * 根据办事分类获取办事指南
+ */
+ List<String> selectclassifyId(String classifyId);
+
+
+ /**
+ * 根据关联词导办事务搜索搜索(不分页)(去重用于小程序)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearchAssociateDistinct( String keyWord);
+
}
--
Gitblit v1.7.1