Subversion Repositories SmartDukaan

Rev

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

Rev 27930 Rev 27931
Line 1002... Line 1002...
1002
						partnersBrandSaleMap.put(un.getBrand(), bpt);
1002
						partnersBrandSaleMap.put(un.getBrand(), bpt);
1003
					}
1003
					}
1004
				}
1004
				}
1005
				accessoriesBrandSales = fofoStoreRepository
1005
				accessoriesBrandSales = fofoStoreRepository
1006
						.selectGroupByBrandAccesoriesWarehousePartnerSale(new ArrayList<>(fofoIds));
1006
						.selectGroupByBrandAccesoriesWarehousePartnerSale(new ArrayList<>(fofoIds));
1007
 
-
 
-
 
1007
				Set<CustomRetailer> positionRetailers = fofoIds.stream().map(x->retailerService.getAllFofoRetailers().get(fofoId)).collect(Collectors.toSet());
-
 
1008
				model.addAttribute("retailers", gson.toJson(positionRetailers));
-
 
1009
				model.addAttribute("reporticoProjectMap", ReporticoProject.salesReporticoProjectMap);
-
 
1010
				model.addAttribute("warehouses", getWarehouses(positionRetailers));
1008
			}
1011
			}
1009
 
1012
 
1010
			if (positions.size() > 0) {
1013
			if (positions.size() > 0) {
1011
				if (positions.stream()
1014
				if (positions.stream()
1012
						.filter(x -> x.getEscalationType().equals(EscalationType.L3)
1015
						.filter(x -> x.getEscalationType().equals(EscalationType.L3)
Line 1040... Line 1043...
1040
					Set<CustomRetailer> positionRetailers = new HashSet<>();
1043
					Set<CustomRetailer> positionRetailers = new HashSet<>();
1041
					csService.getPositionCustomRetailerMap(salesPositions).values().forEach(customRetailers -> {
1044
					csService.getPositionCustomRetailerMap(salesPositions).values().forEach(customRetailers -> {
1042
						positionRetailers.addAll(customRetailers);
1045
						positionRetailers.addAll(customRetailers);
1043
					});
1046
					});
1044
				}*/
1047
				}*/
1045
				if(fofoIds.size() > 0) {
1048
				if(fofoIds == null) {
1046
					Set<CustomRetailer> positionRetailers = fofoIds.stream().map(x->retailerService.getAllFofoRetailers().get(fofoId)).collect(Collectors.toSet());
-
 
1047
					model.addAttribute("retailers", gson.toJson(positionRetailers));
-
 
1048
					model.addAttribute("reporticoProjectMap", ReporticoProject.salesReporticoProjectMap);
-
 
1049
					model.addAttribute("warehouses", getWarehouses(positionRetailers));
-
 
1050
				} else {
-
 
1051
					List<Position> warehousePositions = positions.stream()
1049
					List<Position> warehousePositions = positions.stream()
1052
							.filter(x -> x.getCategoryId() == ProfitMandiConstants.TICKET_CATEGORY_WAREHOUSE)
1050
							.filter(x -> x.getCategoryId() == ProfitMandiConstants.TICKET_CATEGORY_WAREHOUSE)
1053
							.collect(Collectors.toList());
1051
							.collect(Collectors.toList());
1054
					if (warehousePositions.size() > 0) {
1052
					if (warehousePositions.size() > 0) {
1055
						Set<CustomRetailer> positionRetailers = new HashSet<>();
1053
						Set<CustomRetailer> positionRetailers = new HashSet<>();