From 4040856595952ea0b8f8b764ba2770d5c244c891 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 11:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221010
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 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 acb9b84..318691e 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
@@ -25,7 +25,8 @@
*/
public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
@Param("matterAndUser") String matterAndUser,
- @Param("classifyGrade") String classifyGrade);
+ @Param("classifyGrade") String classifyGrade,
+ @Param("ids") List<String> ids);
/**
* 新增导办事务
@@ -54,7 +55,8 @@
* @return
*/
public int countNum(@Param("matterAndUser") String matterAndUser,
- @Param("classifyGrade") String classifyGrade);
+ @Param("classifyGrade") String classifyGrade,
+ @Param("ids") List<String> ids);
/**
* 导办事务搜索
@@ -68,7 +70,7 @@
* @param matterName
* @return
*/
- List<TransactionEvent> queryMatterNameList(String matterName);
+ List<TransactionEvent> queryMatterNameList(@Param("matterName") String matterName,@Param("classifyId") String classifyId);
/**
* 导办事务搜索统计数量
@@ -98,6 +100,15 @@
*/
List<TransactionEvent> queryByClassifyIdList(@Param("classifyId") String classifyId,@Param("departmentId") Integer departmentId);
+
+ /**
+ * 根据分离查询导办事务(分页)
+ * @param classifyId
+ * @return
+ *
+ */
+ List<TransactionEvent> queryByClassifyIdList(IPage<TransactionEvent> page, Integer state,@Param("classifyId") String classifyId,@Param("departmentId") Integer departmentId);
+
/**
* 查询导办事务求和
* @return
@@ -110,6 +121,14 @@
* @return
*/
List<Search> selectSearch(IPage<Search> page, Integer state, String keyWord);
+
+
+ /**
+ * 根据关键词导办事务(部门也会统计进去)搜索(分页)(小程序)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearchList(String keyWord);
/**
* 根据关键词导办事务(部门也会统计进去)搜索(不分页)
@@ -132,4 +151,33 @@
* @return
*/
List<Search> selectSearchAssociate( String keyWord);
+
+ /**
+ * 按ids查找导办事务列表
+ * @param list
+ * @return
+ */
+ List<TransactionEvent> selectListByIds(String[] list);
+
+ /**
+ * 根据部门判断是否有事项名称重复
+ */
+ 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