Subversion Repositories SmartDukaan

Rev

Rev 31172 | Rev 31187 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 31172 Rev 31186
Line 1... Line 1...
1 
 
 1 
 
2 
package com.spice.profitmandi.web.controller;
 2 
package com.spice.profitmandi.web.controller;
3 
 
 3 
 
4 
import java.time.LocalDate;
 4 
import java.time.LocalDate;
5 
import java.time.LocalDateTime;
 5 
import java.time.LocalDateTime;
- 
 
 6 
import java.util.ArrayList;
6 
import java.util.Collection;
 7 
import java.util.Collection;
7 
import java.util.HashMap;
 8 
import java.util.HashMap;
8 
import java.util.List;
 9 
import java.util.List;
9 
import java.util.Map;
 10 
import java.util.Map;
10 
import java.util.Set;
 11 
import java.util.Set;
Line 96... Line 97...
96 
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
 97 
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
97 
 
 98 
 
98 
		Map<Integer, CustomRetailer> partnerAddressMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
 99 
		Map<Integer, CustomRetailer> partnerAddressMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
99 
				.filter(x -> x != null).collect(Collectors.toList()).stream()
 100 
				.filter(x -> x != null).collect(Collectors.toList()).stream()
100 
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
 101 
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
- 
 
 102 
		List<HygieneData> filteredHygieneData = new ArrayList<>();
- 
 
 103 
		if (!hygieneData.isEmpty()) {
- 
 
 104 
			filteredHygieneData.addAll(hygieneData.stream().filter(x -> fofoOrdersMap.values().contains(x.getOrderId()))
- 
 
 105 
					.collect(Collectors.toList()));
101 
 
 106 
 
- 
 
 107 
		}
- 
 
 108 
 
102 
		model.addAttribute("hygieneData", hygieneData).addAttribute("fofoOrder", fofoOrdersMap)
 109 
		model.addAttribute("hygieneData", filteredHygieneData).addAttribute("fofoOrder", fofoOrdersMap)
103 
				.addAttribute("partnerAddress", partnerAddressMap).addAttribute("customerAddress", customerAddress);
 110 
				.addAttribute("partnerAddress", partnerAddressMap).addAttribute("customerAddress", customerAddress);
104 
 
 111 
 
105 
		return "hygiene";
 112 
		return "hygiene";
106 
	}
 113 
	}
107 
 
 114