From 47a58d6b06b53e01321d2398cbc5a35c9923f705 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 10:08:55 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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..df57089 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
@@ -21,7 +21,9 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class TransactionEventImpl extends ServiceImpl<TransactionEventMapper, TransactionEvent> implements ITransactionEventService {
@@ -65,8 +67,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 +112,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,17 +130,22 @@
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);
+ List<String> list = new ArrayList<>();
for (TransactionEvent transactionEvent: transactionEventEntities) {
if (transactionEvent.getAssociateNames()!=null) {
String[] associateNames = transactionEvent.getAssociateNames().split(",");
for (String associateName : associateNames) {
- KeywordEntity keywordEntity = new KeywordEntity();
- keywordEntity.setName(associateName);
- keywordEntityList.add(keywordEntity);
+ list.add(associateName);
}
}
+ }
+ String[] keywords = list.stream().distinct().collect(Collectors.joining(",")).split(",");//去重
+ for (String keyword:keywords) {
+ KeywordEntity keywordEntity=new KeywordEntity();
+ keywordEntity.setName(keyword);
+ keywordEntityList.add(keywordEntity);
}
recommendResult.setKeywordEntityList(keywordEntityList);
List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByKeyWord(keyWord);
@@ -140,6 +158,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