From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014
---
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
index 74dcbf3..f12a26e 100644
--- a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
@@ -1,10 +1,12 @@
package com.dg.core.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.db.manual.pojo.QueryResults;
import com.dg.core.db.manual.pojo.RecommendResult;
import com.dg.core.db.manual.pojo.Search;
+import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -15,14 +17,22 @@
* @param Id
* @return
*/
- public TransactionEvent selectConfigData(String Id);
+ public TransactionEvent selectConfigData(String Id, SysUser sysUser);
/**
* 导办事物列表
* @return
*/
public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
- String matterAndUser, String classifyGrade);
+ String keyword, String classifyGrade,
+ List<String> ids);
+
+ /**
+ * 导办事物列表
+ * @return
+ */
+ public List<TransactionEvent> selectConfigList(String keyword, String classifyGrade,
+ List<String> ids);
/**
* 新增导办事务
@@ -49,7 +59,7 @@
* 统计数量
* @return
*/
- public int countNum(String matterAndUser,String classifyGrade);
+ public int countNum(String keyword,String classifyGrade,List<String> ids);
/**
* 导办事务搜索
@@ -57,6 +67,14 @@
* @return
*/
QueryResults queryMatterNameList(IPage<Search> page, Integer state,Integer recommendSize, String keyWord);
+
+
+ /**
+ * 导办事务搜索(无分页用于小程序)
+ * @param keyWord
+ * @return
+ */
+ QueryResults queryMatterNameList(String keyWord);
/**
* 导办事务搜索统计数量
@@ -66,11 +84,19 @@
int countNumByMatterName(String matterName);
/**
- * 根据分离查询导办事务
+ * 根据分类id查询导办事务
* @param classifyId
* @return
*/
List<TransactionEvent> queryByClassifyIdList(String classifyId,Integer departmentId);
+
+
+ /**
+ * 根据分类id查询导办事务(分页)
+ * @param classifyId
+ * @return
+ */
+ List<TransactionEvent> queryByClassifyIdList(IPage<TransactionEvent> page, Integer state,String classifyId,Integer departmentId);
/**
* 根据查询时间查询导办事务
@@ -103,4 +129,19 @@
* @return
*/
RecommendResult smartConsulting(String keyWord);
+
+
+ /**
+ * 根据部门判断是否有事项名称重复
+ */
+ String selectDataIfExist(@Param("departmentId") String departmentId,
+ @Param("matterName") String matterName);
+
+
+ /**
+ * 根据办事分类获取办事指南
+ */
+ List<String> selectclassifyId(String classifyId);
+
+
}
--
Gitblit v1.7.1