From 03dfa1de5279c75a4206f59226d871823bdbe72e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 10:59:41 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into local_20221024
---
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 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 5da352e..9c9e4d3 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,6 +105,27 @@
queryResults.setTransactionEventList(searchesAssociate);
queryResults.setKeywordEntityList(keywordMapper.selectByName(keyWord));
queryResults.setTotal((baseMapper.selectSearch(keyWord).size()) + (baseMapper.selectSearchAssociate(keyWord).size()));
+ List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord, null);
+ List<String> list = new ArrayList<>();
+ for (TransactionEvent transactionEvent : transactionEventEntities) {
+ if (transactionEvent.getAssociateNames() != null) {
+ String[] associateNames = transactionEvent.getAssociateNames().split(",");
+ for (String associateName : associateNames) {
+ list.add(associateName);
+ }
+ }
+ }
+ List<KeywordEntity> keywordEntityList = new ArrayList<>();
+
+ String[] keywords = list.stream().distinct().collect(Collectors.joining(",")).split(",");//去重
+ for (String keyword : keywords) {
+ if (keyword != null && !keyword.equals("")) {
+ KeywordEntity keywordEntity = new KeywordEntity();
+ keywordEntity.setName(keyword);
+ keywordEntityList.add(keywordEntity);
+ }
+ }
+ queryResults.setKeywordAssociationList(keywordEntityList);
return queryResults;
}
@@ -115,6 +136,7 @@
for (Search search : searches) {
search.setTransactionEventList(baseMapper.queryMatterNameList(keyWord, search.getClassifyId().toString()));
}
+ queryResults.setOrganizationChartEntityList(organizationChartMapper.selectByKeyWord(keyWord));
queryResults.setSearchList(searches);
List<Search> searchesAssociate = baseMapper.selectSearchAssociateDistinct(keyWord);
for (Search search : searchesAssociate) {
@@ -131,15 +153,19 @@
RecommendResult recommendResult = new RecommendResult();
List<KeywordEntity> keywordEntityList = new ArrayList<>();
List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord, null);
+ List<TransactionEvent> transactionEvents = baseMapper.queryAssociateNamesList(keyWord, null);
recommendResult.setTransactionEventList(transactionEventEntities);
List<String> list = new ArrayList<>();
- for (TransactionEvent transactionEvent : transactionEventEntities) {
- if (transactionEvent.getAssociateNames() != null) {
+ for (TransactionEvent transactionEvent : transactionEvents) {
+// 直接返回办事指南名称
+ list.add(transactionEvent.getMatterName());
+// 遍历关键词列表 可能后面流程更改会遇到暂时保存代码;
+ /* if (transactionEvent.getAssociateNames() != null) {
String[] associateNames = transactionEvent.getAssociateNames().split(",");
for (String associateName : associateNames) {
list.add(associateName);
}
- }
+ }*/
}
String[] keywords = list.stream().distinct().collect(Collectors.joining(",")).split(",");//去重
for (String keyword : keywords) {
@@ -163,6 +189,11 @@
@Override
public List<String> selectclassifyId(String classifyId) {
return baseMapper.selectclassifyId(classifyId);
+ }
+
+ @Override
+ public List<TransactionEvent> selectClassifyList(List<String> ids) {
+ return baseMapper.selectClassifyList(ids);
}
@@ -204,7 +235,12 @@
}
@Override
- public List<TransactionEvent> selectList() {
+ public List<TransactionEvent> selectList(String keyWord) {
+ if (keyWord!=null&&keyWord!=""){
+ return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName,keyWord));
+ }
+ else {
return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda());
+ }
}
}
--
Gitblit v1.7.1