From 1f56315094f9b38359d2e75f4fd39aacf338e66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 6 Dec 2023 15:59:44 +0800 Subject: [PATCH] fix:79096 --- .../home/mapper/xml/LawsHomeSearchMapper.xml | 28 ++++++++++++++----- .../impl/LawsHomeSearchServiceImpl.java | 16 +---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml index 5115c78b..7356af12 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml @@ -17,7 +17,6 @@ when standard_state = 7 then 3 else '' end as standard_state_order, - standard_state standard_class,dynamic_type,applicable_vehicle,standard_property,standard_state,'' as standard_code,'' as grade_classification, implementation_date from laws_domestic_standard where del_flag = 0 @@ -53,11 +52,21 @@ select 'standard_class' as field_name,standard_class as dict,count(*) as count from laws_domestic_standard ${ew.sqlSegment} group by standard_class union all - select 'dynamic_type' as field_name,dynamic_type,count(*) from laws_domestic_standard - ${ew.sqlSegment} group by dynamic_type + select 'dynamic_type' as field_name,dynamic_type,count(*) from + (SELECT SUBSTRING_INDEX( SUBSTRING_INDEX( T1.dynamic_type, ',', T2.help_topic_id + 1 ), ',', - 1 ) AS dynamic_type ,standard_number,standard_name + FROM laws_domestic_standard T1 + JOIN mysql.help_topic T2 ON T2.help_topic_id < ( LENGTH( T1.dynamic_type ) - LENGTH( REPLACE ( T1.dynamic_type, ',', '' )) + 1) + ${ew.sqlSegment} + ) a + group by dynamic_type union all - select 'applicable_vehicle' as field_name,applicable_vehicle,count(*) from laws_domestic_standard - ${ew.sqlSegment} group by applicable_vehicle + select 'applicable_vehicle' as field_name,applicable_vehicle,count(*) from + (SELECT SUBSTRING_INDEX( SUBSTRING_INDEX( T1.applicable_vehicle, ',', T2.help_topic_id + 1 ), ',', - 1 ) AS applicable_vehicle ,standard_number,standard_name + FROM laws_domestic_standard T1 + JOIN mysql.help_topic T2 ON T2.help_topic_id < ( LENGTH( T1.applicable_vehicle ) - LENGTH( REPLACE ( T1.applicable_vehicle, ',', '' )) + 1) + ${ew.sqlSegment} + ) a + group by applicable_vehicle union all select 'standard_property' as field_name,standard_property,count(*) from laws_domestic_standard ${ew.sqlSegment} group by standard_property @@ -69,8 +78,13 @@ select 'standard_class' as field_name,standard_class as dict,count(*) as count from laws_overseas_standard ${ew.sqlSegment} group by standard_class union all - select 'applicable_vehicle' as field_name,applicable_vehicle,count(*) from laws_overseas_standard - ${ew.sqlSegment} group by applicable_vehicle + select 'applicable_vehicle' as field_name,applicable_vehicle,count(*) from + (SELECT SUBSTRING_INDEX( SUBSTRING_INDEX( T1.applicable_vehicle, ',', T2.help_topic_id + 1 ), ',', - 1 ) AS applicable_vehicle ,standard_number,standard_name + FROM laws_overseas_standard T1 + JOIN mysql.help_topic T2 ON T2.help_topic_id < ( LENGTH( T1.applicable_vehicle ) - LENGTH( REPLACE ( T1.applicable_vehicle, ',', '' )) + 1) + ${ew.sqlSegment} + ) a + group by applicable_vehicle union all select 'standard_state' as field_name,standard_state,count(*) from laws_overseas_standard ${ew.sqlSegment} group by standard_state diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index b6b7b46a..6736529b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -231,20 +231,6 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { pageList.setRecords(list); } - private List getSysDictItemCores(List listLawsTag) { - List listSysDict = new ArrayList<>(); - if(!CollectionUtils.isEmpty(listLawsTag)){ - List listLawsTagDict = listLawsTag.stream().filter(o->!StringUtils.isBlank(o.getDictFieldSearch()) && StringUtils.isBlank(o.getDictTableSearch())).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listLawsTagDict)){ - List listDict = listLawsTagDict.stream().map(LawsTag::getDictFieldSearch).collect(Collectors.toList()); - QueryWrapper querySysDict = new QueryWrapper<>(); - querySysDict.in("sys_dict.dict_code",listDict); - listSysDict = lawsHomeSearchMapper.translateManyDict(querySysDict); - } - } - return listSysDict; - } - private void addLawsNewsFeed(String searchContent, List listLawsNewsFeed, LawsHomeNormalSearchVO p) { if(!CollectionUtils.isEmpty(listLawsNewsFeed)){ Optional op = listLawsNewsFeed.stream().filter(o-> Objects.equals(o.getId(),p.getId())).findFirst(); @@ -490,7 +476,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { count2(list2,obj); break; case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD: - List list3 = lawsHomeSearchMapper.getCount2(queryWrapper); + List list3 = lawsHomeSearchMapper.getCount3(queryWrapper); count3(list3,obj); break; default:break;