Subversion Repositories SmartDukaan

Rev

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

Rev 30438 Rev 30441
Line 862... Line 862...
862
					.getCollectionMap(fofoIdList, startDate);
862
					.getCollectionMap(fofoIdList, startDate);
863
 
863
 
864
			List<Integer> remarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIdList);
864
			List<Integer> remarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIdList);
865
 
865
 
866
			LOGGER.info("remarkIds {}", remarkIds);
866
			LOGGER.info("remarkIds {}", remarkIds);
867
			Map<CollectionRemark, Long> partnerCollectionRemarks = new HashedMap();
-
 
868
 
867
 
869
			long todayOverallCall = 0;
868
			long todayOverallCall = 0;
870
			if (!remarkIds.isEmpty()) {
869
			if (!remarkIds.isEmpty()) {
871
				todayOverallCall = partnerCollectionRemarkRepository.selectByIds(remarkIds).stream()
870
				todayOverallCall = partnerCollectionRemarkRepository.selectByIds(remarkIds).stream()
872
						.filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
871
						.filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
Line 917... Line 916...
917
			Set<Integer> empHierarchy = allReportees.stream().filter(x -> salesPositionsAuthIds.contains(x))
916
			Set<Integer> empHierarchy = allReportees.stream().filter(x -> salesPositionsAuthIds.contains(x))
918
					.collect(Collectors.toSet());
917
					.collect(Collectors.toSet());
919
 
918
 
920
			List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(new ArrayList<>(empHierarchy));
919
			List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(new ArrayList<>(empHierarchy));
921
 
920
 
-
 
921
			Map<Integer, AuthUser> authUserMap = authRepository.selectAll().stream()
-
 
922
					.collect(Collectors.toMap(x -> x.getId(), x -> x));
-
 
923
 
-
 
924
			LOGGER.info("todayPcpmMap {}", todayPcpmMap);
-
 
925
 
922
			model.addAttribute("authUsers", authUsers);
926
			model.addAttribute("authUsers", authUsers);
-
 
927
			model.addAttribute("authUserMap", authUserMap);
923
			model.addAttribute("partnerCollectionPlanMap", pcpmMap);
928
			model.addAttribute("partnerCollectionPlanMap", pcpmMap);
924
			model.addAttribute("partnerDailyInvestmentMap", partnerDailyInvestmentMap);
929
			model.addAttribute("partnerDailyInvestmentMap", partnerDailyInvestmentMap);
925
			model.addAttribute("customRetailers", customRetailers);
930
			model.addAttribute("customRetailers", customRetailers);
926
			model.addAttribute("rankColorMap", ProfitMandiConstants.Rank_Color_Map);
931
			model.addAttribute("rankColorMap", ProfitMandiConstants.Rank_Color_Map);
927
			model.addAttribute("todayOverallCall", todayOverallCall);
932
			model.addAttribute("todayOverallCall", todayOverallCall);