feat: 取数平台过滤项

gic-cloud-data-hook-api/src/main/java/com/gic/cloud/data/hook/api/dto/FilterQueryDataDTO.java

@@ -20,4 +20,9 @@ public class FilterQueryDataDTO implements Serializable {
      */
     private String itemValue;
 
+    /**
+     * 唯一键
+     */
+    private String itemId;
+
 }

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

@@ -46,6 +46,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());
         ret.setResult(retList);

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

@@ -46,6 +46,7 @@ public class ClerkNameQueryFilter implements BaseQueryFilter {
             filterQueryDataDTO.setShowName(mid.getClerkName());
             filterQueryDataDTO.setItemValue(mid.getClerkName());
             filterQueryDataDTO.setSubShowName(mid.getClerkCode());
+            filterQueryDataDTO.setItemId(mid.getClerkId());
             return filterQueryDataDTO;
         }).collect(Collectors.toList());
         ret.setResult(retList);

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

@@ -11,6 +11,7 @@ import com.gic.cloud.data.hook.service.entity.QueryFilterInfo;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,8 +37,24 @@ public class EnumQueryFilter implements BaseQueryFilter {
     public Page<FilterQueryDataDTO> pageQueryData(QueryFilterContext context) {
         PageHelper.startPage(context);
         List<DhFlatQueryFilterItem> list = dhFlatQueryFilterItemMapper.listQueryFilterItems(context.getQueryFilterInfo().getFilterId());
-        Page<FilterQueryDataDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, FilterQueryDataDTO.class);
-        return retPage;
+
+        Page<DhFlatQueryFilterItem> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, DhFlatQueryFilterItem.class);
+        Page<FilterQueryDataDTO> ret = new Page<>();
+        ret.setPageSize(retPage.getPageSize());
+        ret.setCurrentPage(retPage.getCurrentPage());
+        ret.setTotalCount(retPage.getTotalCount());
+        if (CollectionUtils.isEmpty(retPage.getResult())) {
+            return ret;
+        }
+        List<FilterQueryDataDTO> collect = retPage.getResult().stream().map(mid -> {
+            FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
+            filterQueryDataDTO.setItemValue(mid.getItemValue());
+            filterQueryDataDTO.setShowName(mid.getShowName());
+            filterQueryDataDTO.setItemId(mid.getItemValue());
+            return filterQueryDataDTO;
+        }).collect(Collectors.toList());
+        ret.setResult(collect);
+        return ret;
     }
 
     @Override

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

@@ -60,6 +60,7 @@ public class StoreCodeQueryFilter implements BaseQueryFilter {
             filterQueryDataDTO.setShowName(mid.getStoreCode());
             filterQueryDataDTO.setItemValue(mid.getStoreCode());
             filterQueryDataDTO.setSubShowName(mid.getStoreName());
+            filterQueryDataDTO.setItemId(mid.getStoreId());
             return filterQueryDataDTO;
         }).collect(Collectors.toList());
         ret.setResult(retList);

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

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

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

@@ -58,6 +58,7 @@ public class StoreNameQueryFilter implements BaseQueryFilter {
             filterQueryDataDTO.setShowName(mid.getStoreName());
             filterQueryDataDTO.setItemValue(mid.getStoreName());
             filterQueryDataDTO.setSubShowName(mid.getStoreCode());
+            filterQueryDataDTO.setItemId(mid.getStoreId());
             return filterQueryDataDTO;
         }).collect(Collectors.toList());
         ret.setResult(retList);

gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/FlatQueryController.java

@@ -184,7 +184,7 @@ public class FlatQueryController {
 
 
 
-	/** 查询条件回显
+	/** 查询条件filterCode 回显
 	 * @return
 	 */
 	@RequestMapping("/flat-query-filter-show-back")