Subversion Repositories SmartDukaan

Rev

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

Rev 26122 Rev 26265
Line 698... Line 698...
698
		List<FofoStore> fofoStores = fofoStoreRepository.selectActiveStores();
698
		List<FofoStore> fofoStores = fofoStoreRepository.selectActiveStores();
699
		Map<Integer, CustomRetailer> customRetailerMap = retailerService
699
		Map<Integer, CustomRetailer> customRetailerMap = retailerService
700
				.getFofoRetailers(fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList()));
700
				.getFofoRetailers(fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList()));
701
 
701
 
702
		List<String> headers = Arrays.asList("Code", "Firm Name", "Store Name", "State Manager", "Teritory/Team Lead",
702
		List<String> headers = Arrays.asList("Code", "Firm Name", "Store Name", "State Manager", "Teritory/Team Lead",
703
				"Wallet Amount", "In Stock Amount", "Return In Transit Stock", "Unbilled Amount", "Grn Pending Amount",
703
				"Wallet Amount", "In Stock Amount", "Activated Stock", "Return In Transit Stock", "Unbilled Amount", "Grn Pending Amount",
704
				"Min Investment", "Investment Amount", "Investment Short", "Unbilled Qty");
704
				"Min Investment", "Investment Amount", "Investment Short", "Unbilled Qty");
705
		List<List<?>> rows = new ArrayList<>();
705
		List<List<?>> rows = new ArrayList<>();
706
		Map<Integer, List<?>> partnerRowsMap = new HashMap<>();
706
		Map<Integer, List<?>> partnerRowsMap = new HashMap<>();
707
 
707
 
708
		Map<Integer, List<Serializable>> partnerIdSalesHeaderMap = this.getPartnerIdSalesHeaders();
708
		Map<Integer, List<Serializable>> partnerIdSalesHeaderMap = this.getPartnerIdSalesHeaders();
Line 723... Line 723...
723
				continue;
723
				continue;
724
			}
724
			}
725
			List<Serializable> row = partnerIdSalesHeaderMap.get(fofoStore.getId());
725
			List<Serializable> row = partnerIdSalesHeaderMap.get(fofoStore.getId());
726
			row.addAll(
726
			row.addAll(
727
					Arrays.asList(partnerDailyInvestment.getWalletAmount(), partnerDailyInvestment.getInStockAmount(),
727
					Arrays.asList(partnerDailyInvestment.getWalletAmount(), partnerDailyInvestment.getInStockAmount(),
-
 
728
							partnerDailyInvestment.getActivatedStockAmount() == 0 ? "-":"("+partnerDailyInvestment.getActivatedStockAmount()+")",
728
							0, partnerDailyInvestment.getUnbilledAmount(), partnerDailyInvestment.getGrnPendingAmount(),
729
							0, partnerDailyInvestment.getUnbilledAmount(), partnerDailyInvestment.getGrnPendingAmount(),
729
							partnerDailyInvestment.getMinInvestment(), partnerDailyInvestment.getTotalInvestment(),
730
							partnerDailyInvestment.getMinInvestment(), partnerDailyInvestment.getTotalInvestment(),
730
							partnerDailyInvestment.getShortInvestment(), partnerDailyInvestment.getUnbilledQty()));
731
							partnerDailyInvestment.getShortInvestment(), partnerDailyInvestment.getUnbilledQty()));
731
			partnerRowsMap.put(fofoStore.getId(), row);
732
			partnerRowsMap.put(fofoStore.getId(), row);
732
			rows.add(row);
733
			rows.add(row);