From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java | 21 ++++++++++++++++++---
1 files changed, 18 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 d5b70e3..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,9 +24,10 @@
* @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);
+
@@ -35,7 +36,7 @@
* @param
* @return
*/
- public List<TransactionEvent> selectConfigList(@Param("matterAndUser") String matterAndUser,
+ public List<TransactionEvent> selectConfigList(@Param("keyword") String keyword,
@Param("classifyGrade") String classifyGrade,
@Param("ids") List<String> ids);
@@ -65,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);
@@ -82,6 +83,13 @@
* @return
*/
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);
/**
* 导办事务搜索统计数量
@@ -171,6 +179,13 @@
List<TransactionEvent> selectListByIds(String[] list);
/**
+ * 根据分类筛选数据
+ * @param ids
+ * @return
+ */
+ List<TransactionEvent> selectClassifyList(List<String> ids);
+
+ /**
* 根据部门判断是否有事项名称重复
*/
String selectDataIfExist(@Param("departmentId") String departmentId,
--
Gitblit v1.7.1