From aa343eafae29f8171d22496ce876ead1d0f07bd0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 14:36:42 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/resources/mapper/OrganizationChartMapper.xml | 6 +++---
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 2 +-
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 10 +++++++---
3 files changed, 11 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 87ea3c5..ef4f73f 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
@@ -152,15 +152,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) {
diff --git a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
index caa8798..f608c71 100644
--- a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
+++ b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
@@ -86,9 +86,9 @@
<select id="selectByKeyWord" resultMap="OrganizationChartResult">
<include refid="selectOrganizationChartVo"/>
- where organization_name like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', organization_name, '%')
- or((detailed_address like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', detailed_address, '%')) and TRIM(detailed_address) != '')
- or((resume like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', resume, '%')) and TRIM(resume) != '' )
+ where organization_name like concat('%', #{keyWord}, '%')
+ or((detailed_address like concat('%', #{keyWord}, '%') ) and TRIM(detailed_address) !='')
+ or((resume like concat('%', #{keyWord}, '%') ) and TRIM(resume) != '' )
</select>
<select id="selectByCode" resultMap="OrganizationChartResult">
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index 93201fb..05dd6ea 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -345,7 +345,7 @@
<include refid="selectTransactionEventEntityVo"/>
<where>
<if test="matterName != null and matterName != ''">
- AND (matter_name like concat('%', #{matterName}, '%') or #{matterName} like concat('%', matter_name, '%'))
+ AND (matter_name like concat('%', #{matterName}, '%') )
</if>
<if test="classifyId != null and classifyId != ''">
and (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
--
Gitblit v1.7.1