feat: 取数平台过滤项

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/ClerkCodeQueryFilter.java

@@ -12,7 +12,9 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -55,7 +57,8 @@ public class ClerkCodeQueryFilter implements BaseQueryFilter {
 
     @Override
     public List<FilterQueryDataDTO> listBackByItems(QueryFilterContext context) {
-        List<ClerkDTO> clerkDTOS = clerkService.listClerk(context.getEnterpriseId(), context.getItems());
+        Set<String> ids = new HashSet<>(context.getItems());
+        List<ClerkDTO> clerkDTOS = clerkService.getClerkByClerkIds(ids);
         if (CollectionUtils.isEmpty(clerkDTOS)) {
             return null;
         }
@@ -64,6 +67,7 @@ public class ClerkCodeQueryFilter implements BaseQueryFilter {
             filterQueryDataDTO.setShowName(mid.getClerkCode());
             filterQueryDataDTO.setItemValue(mid.getClerkCode());
             filterQueryDataDTO.setSubShowName(mid.getClerkName());
+            filterQueryDataDTO.setItemId(mid.getClerkId());
             return filterQueryDataDTO;
         }).collect(Collectors.toList());
         return retList;

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/ClerkNameQueryFilter.java

@@ -12,7 +12,9 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -55,12 +57,19 @@ public class ClerkNameQueryFilter implements BaseQueryFilter {
 
     @Override
     public List<FilterQueryDataDTO> listBackByItems(QueryFilterContext context) {
-        List<String> items = context.getItems();
-        return items.stream().map(mid->{
+        Set<String> ids = new HashSet<>(context.getItems());
+        List<ClerkDTO> clerkDTOS = clerkService.getClerkByClerkIds(ids);
+        if (CollectionUtils.isEmpty(clerkDTOS)) {
+            return null;
+        }
+        List<FilterQueryDataDTO> retList = clerkDTOS.stream().map(mid -> {
             FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
-            filterQueryDataDTO.setShowName(mid);
-            filterQueryDataDTO.setItemValue(mid);
+            filterQueryDataDTO.setShowName(mid.getClerkName());
+            filterQueryDataDTO.setItemValue(mid.getClerkName());
+            filterQueryDataDTO.setSubShowName(mid.getClerkCode());
+            filterQueryDataDTO.setItemId(mid.getClerkId());
             return filterQueryDataDTO;
         }).collect(Collectors.toList());
+        return retList;
     }
 }

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/EnumQueryFilter.java

@@ -62,6 +62,13 @@ public class EnumQueryFilter implements BaseQueryFilter {
         List<String> items = context.getItems();
         List<DhFlatQueryFilterItem> list = dhFlatQueryFilterItemMapper.listQueryFilterItems(context.getQueryFilterInfo().getFilterId());
         List<DhFlatQueryFilterItem> orgItems = list.stream().filter(mid -> items.contains(mid.getItemValue())).collect(Collectors.toList());
-        return EntityUtil.changeEntityListByJSON(FilterQueryDataDTO.class,orgItems);
+        List<FilterQueryDataDTO> collect = orgItems.stream().map(mid -> {
+            FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
+            filterQueryDataDTO.setItemValue(mid.getItemValue());
+            filterQueryDataDTO.setShowName(mid.getShowName());
+            filterQueryDataDTO.setItemId(mid.getItemValue());
+            return filterQueryDataDTO;
+        }).collect(Collectors.toList());
+        return collect;
     }
 }

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/StoreCodeQueryFilter.java

@@ -70,12 +70,15 @@ public class StoreCodeQueryFilter implements BaseQueryFilter {
 
     @Override
     public List<FilterQueryDataDTO> listBackByItems(QueryFilterContext context) {
-        List<String> items = context.getItems();
-        return items.stream().map(mid->{
+        List<StoreDTO> storeDTOS = storeService.queryStore(context.getItems());
+        List<FilterQueryDataDTO> retList = storeDTOS.stream().map(mid -> {
             FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
-            filterQueryDataDTO.setShowName(mid);
-            filterQueryDataDTO.setItemValue(mid);
+            filterQueryDataDTO.setShowName(mid.getStoreCode());
+            filterQueryDataDTO.setItemValue(mid.getStoreCode());
+            filterQueryDataDTO.setSubShowName(mid.getStoreName());
+            filterQueryDataDTO.setItemId(mid.getStoreId());
             return filterQueryDataDTO;
         }).collect(Collectors.toList());
+        return retList;
     }
 }

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/StoreGroupNameQueryFilter.java

@@ -90,6 +90,7 @@ public class StoreGroupNameQueryFilter implements BaseQueryFilter {
             FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
             filterQueryDataDTO.setShowName(mid);
             filterQueryDataDTO.setItemValue(mid);
+            filterQueryDataDTO.setItemId(mid);
             return filterQueryDataDTO;
         }).collect(Collectors.toList());
     }

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/StoreNameQueryFilter.java

@@ -67,12 +67,15 @@ public class StoreNameQueryFilter implements BaseQueryFilter {
 
     @Override
     public List<FilterQueryDataDTO> listBackByItems(QueryFilterContext context) {
-        List<String> items = context.getItems();
-        return items.stream().map(mid->{
+        List<StoreDTO> storeDTOS = storeService.queryStore(context.getItems());
+        List<FilterQueryDataDTO> retList = storeDTOS.stream().map(mid -> {
             FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
-            filterQueryDataDTO.setShowName(mid);
-            filterQueryDataDTO.setItemValue(mid);
+            filterQueryDataDTO.setShowName(mid.getStoreCode());
+            filterQueryDataDTO.setItemValue(mid.getStoreCode());
+            filterQueryDataDTO.setSubShowName(mid.getStoreName());
+            filterQueryDataDTO.setItemId(mid.getStoreId());
             return filterQueryDataDTO;
         }).collect(Collectors.toList());
+        return retList;
     }
 }