Subversion Repositories SmartDukaan

Rev

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

Rev 30799 Rev 30800
Line 915... Line 915...
915 
						targetCollection = collectionPlan.getTargetPlan();
 915 
						targetCollection = collectionPlan.getTargetPlan();
916 
					}
 916 
					}
917 
 
 917 
 
918 
					if (!collectionPlan.getCommittedDate().isAfter(startDate)) {
 918 
					if (!collectionPlan.getCommittedDate().isAfter(startDate)) {
919 
						totalPartnerTargetCollection += targetCollection;
 919 
						totalPartnerTargetCollection += targetCollection;
- 
 
 920 
						totalPartnerAchievement = collectionPlan.getAchievementPlan();
920 
					}
 921 
					}
921 
 
 922 
 
922 
				}
 923 
				}
923 
			}
 924 
			}
924 
			model.addAttribute("totalPartnerTargetCollection", totalPartnerTargetCollection);
 925 
			model.addAttribute("totalPartnerTargetCollection", totalPartnerTargetCollection);
925 
			Map<Integer, PartnerCollectionAchievementModel> collectionAchievementMap = userWalletRepository
 - 
 
926 
					.getPartnerWiseCollectionAchievement(fofoIdList, startDate).stream()
 - 
 
927 
					.collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
 - 
 
928 
 
 - 
 
929 
			LOGGER.info("collectionAchievementMap {} ", collectionAchievementMap);
 - 
 
930 
 
 - 
 
931 
			totalPartnerAchievement = collectionAchievementMap.entrySet().stream()
 - 
 
932 
					.filter(x -> x.getValue().getAmount() != null)
 - 
 
933 
					.collect(Collectors.summingLong(x -> x.getValue().getAmount()));
 - 
 
934 
 
 926 
 
935 
			model.addAttribute("totalPartnerAchievement", totalPartnerAchievement);
 927 
			model.addAttribute("totalPartnerAchievement", totalPartnerAchievement);
936 
 
 928 
 
937 
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
 929 
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
938 
			Map<Integer, CustomRetailer> customRetailers = fofoIdList.stream().distinct()
 930 
			Map<Integer, CustomRetailer> customRetailers = fofoIdList.stream().distinct()