From 45e4e73fcc9923d79499332a476721b23e080e93 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 20 十月 2022 10:51:50 +0800
Subject: [PATCH] 修改【导办工单管理】无法搜索 bug

---
 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
index 56fdd6c..7b4a4c5 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -65,8 +65,13 @@
 
     @Override
     public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
-                                                   String matterAndUser, String classifyGrade,List<String> ids) {
-        return baseMapper.selectConfigList(page,  state, matterAndUser, classifyGrade,ids);
+                                                   String keyword, String classifyGrade,List<String> ids) {
+        return baseMapper.selectConfigList(page,  state, keyword, classifyGrade,ids);
+    }
+
+    @Override
+    public List<TransactionEvent> selectConfigList(String keyword, String classifyGrade, List<String> ids) {
+        return baseMapper.selectConfigList(keyword,classifyGrade,ids);
     }
 
     @Override
@@ -105,8 +110,14 @@
     public QueryResults queryMatterNameList(String keyWord) {
         QueryResults queryResults = new QueryResults();
         List<Search> searches = baseMapper.selectSearchList(keyWord);
+        for (Search search:searches) {
+            search.setTransactionEventList(baseMapper.queryMatterNameList(keyWord,search.getClassifyId().toString()));
+        }
         queryResults.setSearchList(searches);
-        List<Search> searchesAssociate = baseMapper.selectSearchAssociate(keyWord);
+        List<Search> searchesAssociate = baseMapper.selectSearchAssociateDistinct(keyWord);
+        for (Search search:searchesAssociate) {
+            search.setTransactionEventList(baseMapper.queryAssociateNamesList(keyWord,search.getClassifyId().toString()));
+        }
         queryResults.setTransactionEventList(searchesAssociate);
         queryResults.setKeywordEntityList( keywordMapper.selectByName(keyWord));
         return queryResults;
@@ -117,7 +128,7 @@
     public RecommendResult smartConsulting(String keyWord){
         RecommendResult recommendResult=new RecommendResult();
         List<KeywordEntity> keywordEntityList=new ArrayList<>();
-        List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord);
+        List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord,null);
         recommendResult.setTransactionEventList(transactionEventEntities);
         for (TransactionEvent transactionEvent: transactionEventEntities) {
             if (transactionEvent.getAssociateNames()!=null) {
@@ -140,6 +151,11 @@
         return baseMapper.selectDataIfExist(departmentId,matterName);
     }
 
+    @Override
+    public List<String> selectclassifyId(String classifyId) {
+        return baseMapper.selectclassifyId(classifyId);
+    }
+
 
     @Override
     public int countNumByMatterName(String matterName) {

--
Gitblit v1.7.1