From d9f7787e24dd9ee4136298bcfd141aed1bb3ed7c Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 14 十月 2022 09:41:57 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..6cca075 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
@@ -105,8 +105,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.queryMatterNameList(keyWord,search.getClassifyId().toString()));
+ }
queryResults.setTransactionEventList(searchesAssociate);
queryResults.setKeywordEntityList( keywordMapper.selectByName(keyWord));
return queryResults;
@@ -117,7 +123,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 +146,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