| Line 97... |
Line 97... |
| 97 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
|
97 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
|
| 98 |
|
98 |
|
| 99 |
Map<Integer, CustomRetailer> partnerAddressMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
|
99 |
Map<Integer, CustomRetailer> partnerAddressMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
|
| 100 |
.filter(x -> x != null).collect(Collectors.toList()).stream()
|
100 |
.filter(x -> x != null).collect(Collectors.toList()).stream()
|
| 101 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
101 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| - |
|
102 |
|
| 102 |
List<HygieneData> filteredHygieneData = new ArrayList<>();
|
103 |
List<HygieneData> filteredHygieneData = new ArrayList<>();
|
| 103 |
if (!hygieneData.isEmpty()) {
|
104 |
if (!hygieneData.isEmpty()) {
|
| - |
|
105 |
List<Integer> filteredOrderIds = fofoOrdersMap.values().stream().map(x -> x.getId())
|
| - |
|
106 |
.collect(Collectors.toList());
|
| - |
|
107 |
|
| 104 |
filteredHygieneData.addAll(hygieneData.stream().filter(x -> fofoOrdersMap.values().contains(x.getOrderId()))
|
108 |
filteredHygieneData.addAll(hygieneData.stream().filter(x -> filteredOrderIds.contains(x.getOrderId()))
|
| 105 |
.collect(Collectors.toList()));
|
109 |
.collect(Collectors.toList()));
|
| 106 |
|
110 |
|
| 107 |
}
|
111 |
}
|
| 108 |
|
112 |
|
| 109 |
model.addAttribute("hygieneData", filteredHygieneData).addAttribute("fofoOrder", fofoOrdersMap)
|
113 |
model.addAttribute("hygieneData", filteredHygieneData).addAttribute("fofoOrder", fofoOrdersMap)
|