From 1afb2a9df1a582efac30c8c12e01fdeab8b60ec7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 09:52:12 +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 | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 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 7d4c8e6..4625997 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
@@ -28,6 +28,17 @@
@Param("classifyGrade") String classifyGrade,
@Param("ids") List<String> ids);
+
+
+ /**
+ * 导办事物列表 (部分也)
+ * @param
+ * @return
+ */
+ public List<TransactionEvent> selectConfigList(@Param("matterAndUser") String matterAndUser,
+ @Param("classifyGrade") String classifyGrade,
+ @Param("ids") List<String> ids);
+
/**
* 新增导办事务
* @param entity
@@ -70,7 +81,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);
/**
* 导办事务搜索统计数量
@@ -159,11 +177,24 @@
*/
List<TransactionEvent> selectListByIds(String[] list);
+ /**
+ * 根据部门判断是否有事项名称重复
+ */
+ String selectDataIfExist(@Param("departmentId") String departmentId,
+ @Param("matterName") String matterName);
/**
- * 获取统计数据 首页用 勿动
+ * 根据办事分类获取办事指南
*/
- int countStatisticsNum(List<String> classifyIds);
+ List<String> selectclassifyId(String classifyId);
+
+
+ /**
+ * 根据关联词导办事务搜索搜索(不分页)(去重用于小程序)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearchAssociateDistinct( String keyWord);
--
Gitblit v1.7.1