From 93e84d0d767cd52593b058100c528fc9b5ec0a8c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 13:35:37 +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 | 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 4625997..8d57068 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);
@@ -178,6 +178,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