From 70efbfc8399978f685e91b3ab2fb414cbaf80b63 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 18 十月 2022 17:01:54 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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 110dc0c..03927e8 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
@@ -70,6 +70,11 @@
}
@Override
+ public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade, List<String> ids) {
+ return baseMapper.selectConfigList(matterAndUser,classifyGrade,ids);
+ }
+
+ @Override
public int insertConfig(TransactionEvent entity) {
return baseMapper.insertConfig(entity);
}
@@ -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,16 +128,17 @@
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) {
- String[] associateNames = transactionEvent.getAssociateNames().split(",");
- for (String associateName: associateNames) {
- KeywordEntity keywordEntity = new KeywordEntity();
- keywordEntity.setName(associateName);
- keywordEntityList.add(keywordEntity);
+ if (transactionEvent.getAssociateNames()!=null) {
+ String[] associateNames = transactionEvent.getAssociateNames().split(",");
+ for (String associateName : associateNames) {
+ KeywordEntity keywordEntity = new KeywordEntity();
+ keywordEntity.setName(associateName);
+ keywordEntityList.add(keywordEntity);
+ }
}
-
}
recommendResult.setKeywordEntityList(keywordEntityList);
List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByKeyWord(keyWord);
@@ -135,6 +147,17 @@
}
@Override
+ public String selectDataIfExist(String departmentId, String matterName) {
+ return baseMapper.selectDataIfExist(departmentId,matterName);
+ }
+
+ @Override
+ public List<String> selectclassifyId(String classifyId) {
+ return baseMapper.selectclassifyId(classifyId);
+ }
+
+
+ @Override
public int countNumByMatterName(String matterName) {
return baseMapper.countNumByMatterName(matterName);
}
--
Gitblit v1.7.1