Subversion Repositories SmartDukaan

Rev

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

Rev 33306 Rev 33313
Line 1331... Line 1331...
1331
        brandSet.addAll(lastMonthPurchaseInMarginMap.keySet());
1331
        brandSet.addAll(lastMonthPurchaseInMarginMap.keySet());
1332
        brandSet.addAll(lastMonthSaleMarginMap.keySet());
1332
        brandSet.addAll(lastMonthSaleMarginMap.keySet());
1333
        brandSet.addAll(lastMonthPendingIncomeMap.keySet());
1333
        brandSet.addAll(lastMonthPendingIncomeMap.keySet());
1334
        brandSet.addAll(additionalPurchasePayout.keySet());
1334
        brandSet.addAll(additionalPurchasePayout.keySet());
1335
        brandSet.addAll(additionSalePayout.keySet());
1335
        brandSet.addAll(additionSalePayout.keySet());
-
 
1336
        brandSet.addAll(lastMonthFrontEndIncomeMap.keySet());
1336
        brandSet.stream().forEach(brand -> {
1337
        brandSet.stream().forEach(brand -> {
1337
            totalAmountMap.put(brand,
1338
            totalAmountMap.put(brand,
1338
                    (lastMonthSaleMarginMap.get(brand) == null ? 0 : lastMonthSaleMarginMap.get(brand).getAmount()) +
1339
                    (lastMonthSaleMarginMap.get(brand) == null ? 0 : lastMonthSaleMarginMap.get(brand).getAmount()) +
1339
                            (lastMonthPurchaseInMarginMap.get(brand) == null ? 0 : lastMonthPurchaseInMarginMap.get(brand).getAmount()) +
1340
                            (lastMonthPurchaseInMarginMap.get(brand) == null ? 0 : lastMonthPurchaseInMarginMap.get(brand).getAmount()) +
1340
                            (lastMonthPendingIncomeMap.get(brand) == null ? 0 : lastMonthPendingIncomeMap.get(brand).getAmount()) +
1341
                            (lastMonthPendingIncomeMap.get(brand) == null ? 0 : lastMonthPendingIncomeMap.get(brand).getAmount()) +