From 71df1c0a0a92ac0635e579d6a77d9ced7e9ccf23 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 14:38:17 +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 |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 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 079a943..0feac85 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);
 
     /**
      * 导办事务搜索
@@ -156,4 +158,18 @@
      * @return
      */
     List<TransactionEvent> selectListByIds(String[] list);
+
+    /**
+     * 根据部门判断是否有事项名称重复
+     */
+    String selectDataIfExist(@Param("departmentId") String departmentId,
+                             @Param("matterName") String matterName);
+
+    /**
+     * 根据办事分类获取办事指南
+     */
+    List<String> selectclassifyId(String classifyId);
+
+
+
 }

--
Gitblit v1.7.1