From 27704b0f33dfa3b22f11d36124a8d08b720461f8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 19 十月 2022 13:27:20 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java | 13 ++++++++++---
1 files changed, 10 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..ffe2848 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,7 @@
* @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 +35,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 +65,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);
@@ -84,6 +84,13 @@
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);
+
+ /**
* 导办事务搜索统计数量
* @param matterName
* @return
--
Gitblit v1.7.1