Commit d1c8e7fa by fudahua

feat: 无分页门店

parent 5110911e
...@@ -16,8 +16,10 @@ import org.apache.commons.collections.CollectionUtils; ...@@ -16,8 +16,10 @@ import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
...@@ -41,20 +43,20 @@ public class StoreGroupNameQueryFilter implements BaseQueryFilter { ...@@ -41,20 +43,20 @@ public class StoreGroupNameQueryFilter implements BaseQueryFilter {
List<PowerStoreGroupDTO> storeGroupList = storeGroupService.getStoreGroupList(context.getEnterpriseId()); List<PowerStoreGroupDTO> storeGroupList = storeGroupService.getStoreGroupList(context.getEnterpriseId());
Map<String, PowerStoreGroupDTO> storeGroupMap = storeGroupList.stream().collect(Collectors.toMap(mid -> mid.getStoreGroupId(), mid -> mid)); Map<String, PowerStoreGroupDTO> storeGroupMap = storeGroupList.stream().collect(Collectors.toMap(mid -> mid.getStoreGroupId(), mid -> mid));
List<FilterQueryDataDTO> retList = storeGroupList.stream().map(mid -> { Set<FilterQueryDataDTO> retList = storeGroupList.stream().map(mid -> {
String storeGroupChainName = getStoreGroupChainName(storeGroupMap, mid); String storeGroupChainName = getStoreGroupChainName(storeGroupMap, mid);
FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO(); FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
filterQueryDataDTO.setShowName(storeGroupChainName); filterQueryDataDTO.setShowName(storeGroupChainName);
filterQueryDataDTO.setItemValue(storeGroupChainName); filterQueryDataDTO.setItemValue(storeGroupChainName);
filterQueryDataDTO.setItemId(storeGroupChainName); filterQueryDataDTO.setItemId(storeGroupChainName);
return filterQueryDataDTO; return filterQueryDataDTO;
}).collect(Collectors.toList()); }).collect(Collectors.toSet());
Page<FilterQueryDataDTO> page = new Page<>(); Page<FilterQueryDataDTO> page = new Page<>();
page.setTotalCount(retList.size()); page.setTotalCount(retList.size());
page.setPageSize(retList.size()); page.setPageSize(retList.size());
page.setCurrentPage(1); page.setCurrentPage(1);
page.setResult(retList); page.setResult(new ArrayList<>(retList));
return page; return page;
} }
......
...@@ -30,7 +30,7 @@ public class QueryFilterTest { ...@@ -30,7 +30,7 @@ public class QueryFilterTest {
@Test @Test
public void test(){ public void test(){
QueryFilterContext queryFilterContext = new QueryFilterContext(); QueryFilterContext queryFilterContext = new QueryFilterContext();
DhFlatQueryFilter dhFlatQueryFilter = dhFlatQueryFilterMapper.selectByPrimaryKey(2L); DhFlatQueryFilter dhFlatQueryFilter = dhFlatQueryFilterMapper.selectByPrimaryKey(1L);
if (null == dhFlatQueryFilter) { if (null == dhFlatQueryFilter) {
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment