WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

         Map<String, Long> rbmBilledCountMapFirstWeek = rbmBilledFofoIdsModelsFirstWeek.stream()
                 .filter(x -> x.getStatus().equals("Billed"))
                 .collect(Collectors.groupingBy(RbmBilledFofoIdsModel::getRbmName, Collectors.counting()));
+        long totalFirstWeekCount = rbmBilledCountMapFirstWeek.values().stream()
+                .mapToLong(Long::longValue)
+                .sum();
         Map<String, Long> rbmTargetedFofoIdCountMap = rbmBilledFofoIdsModelsFirstWeek.stream()
                 .collect(Collectors.groupingBy(
                         RbmBilledFofoIdsModel::getRbmName, // Group by RBM Name
                         Collectors.counting() // Count all fofoId entries for each RBM
                 ));
+        long totalTargetedCount = rbmTargetedFofoIdCountMap.values().stream().mapToLong(x -> x.longValue()).sum();
 //        second week count of rbm partner billing
         LocalDate eightOfCurrentMonth = LocalDate.now().withDayOfMonth(8);
         Map<String, Long> rbmBilledCountMapSecondWeek = rbmBilledFofoIdsModelsSecondWeek.stream()
                 .filter(x -> x.getStatus().equals("Billed"))
                 .collect(Collectors.groupingBy(RbmBilledFofoIdsModel::getRbmName, Collectors.counting()));
+        long totalSecondWeekCount = rbmBilledCountMapSecondWeek.values().stream().mapToLong(Long::longValue).sum();
 //      third week count of rbm partner billing
         LocalDate sixteenOfCurrentMonth = LocalDate.now().withDayOfMonth(16);
-        LocalDate twentySecondOfCurrentMonth = LocalDate.now().withDayOfMonth(22);
+        LocalDate twentyFirstOfCurrentMonth = LocalDate.now().withDayOfMonth(21);
-        List<RbmBilledFofoIdsModel> rbmBilledFofoIdsModelsThirdWeek = rbmTargetService.getDateWiseBilledFofoIdByRbm(sixteenOfCurrentMonth, twentySecondOfCurrentMonth);
+        List<RbmBilledFofoIdsModel> rbmBilledFofoIdsModelsThirdWeek = rbmTargetService.getDateWiseBilledFofoIdByRbm(sixteenOfCurrentMonth, twentyFirstOfCurrentMonth);
         Map<String, Long> rbmBilledCountMapThirdWeek = rbmBilledFofoIdsModelsThirdWeek.stream()
                 .filter(x -> x.getStatus().equals("Billed"))
                 .collect(Collectors.groupingBy(RbmBilledFofoIdsModel::getRbmName, Collectors.counting()));
+        long totalThirdWeekCount = rbmBilledCountMapThirdWeek.values().stream().mapToLong(Long::longValue).sum();
         //      fourth week count of rbm partner billing
-        LocalDate twentyThirdOfCurrentMonth = LocalDate.now().withDayOfMonth(23);
+        LocalDate twentySecondOfCurrentMonth = LocalDate.now().withDayOfMonth(22);
         LocalDate lastDayOfCurrentMonth = LocalDate.now().withDayOfMonth(LocalDate.now().lengthOfMonth());
-        List<RbmBilledFofoIdsModel> rbmBilledFofoIdsModelsFourthWeek = rbmTargetService.getDateWiseBilledFofoIdByRbm(twentyThirdOfCurrentMonth, lastDayOfCurrentMonth);
+        List<RbmBilledFofoIdsModel> rbmBilledFofoIdsModelsFourthWeek = rbmTargetService.getDateWiseBilledFofoIdByRbm(twentySecondOfCurrentMonth, lastDayOfCurrentMonth);
         Map<String, Long> rbmBilledCountMapFourthWeek = rbmBilledFofoIdsModelsFourthWeek.stream()
                 .filter(x -> x.getStatus().equals("Billed"))
                 .collect(Collectors.groupingBy(RbmBilledFofoIdsModel::getRbmName, Collectors.counting()));
+        long totalFourthWeekCount = rbmBilledCountMapFourthWeek.values().stream().mapToLong(x -> x.longValue()).sum();
 //      mtd rbm partner billing
         List<RbmBilledFofoIdsModel> rbmBilledFofoIdsModelsMtd = rbmTargetService.getDateWiseBilledFofoIdByRbm(firstOfCurrentMonth, LocalDate.now());
         Map<String, Long> rbmBilledCountMapMtd = rbmBilledFofoIdsModelsMtd.stream()
                 .filter(x -> x.getStatus().equals("Billed"))
                 .collect(Collectors.groupingBy(RbmBilledFofoIdsModel::getRbmName, Collectors.counting()));
+        long totalMtdCount = rbmBilledCountMapMtd.values().stream().mapToLong(Long::longValue).sum();
+        Map<String, Long> zeroBilledCountMap = rbmTargetedFofoIdCountMap.entrySet().stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> entry.getValue() - rbmBilledCountMapMtd.getOrDefault(entry.getKey(), 0L)
+                ));
+        long totalZeroBilledCount = zeroBilledCountMap.values().stream().mapToLong(Long::longValue).sum();
         LOGGER.info("rbmArrViewModels {}", rbmArrViewModels);
         model.addAttribute("rbmArrViewModels", rbmArrViewModels);
         model.addAttribute("totalTarget", totalTarget);
         model.addAttribute("totalAchieved", totalAchieved);
         model.addAttribute("sold15daysOldAgingModels", sold15daysOldAgingModels);
         model.addAttribute("rbmBilledCountMapFirstWeek", rbmBilledCountMapFirstWeek);
         model.addAttribute("rbmBilledCountMapSecondWeek", rbmBilledCountMapSecondWeek);
         model.addAttribute("rbmBilledCountMapThirdWeek", rbmBilledCountMapThirdWeek);
         model.addAttribute("rbmBilledCountMapFourthWeek", rbmBilledCountMapFourthWeek);
         model.addAttribute("rbmBilledCountMapMtd", rbmBilledCountMapMtd);
+        model.addAttribute("zeroBilledCountMap", zeroBilledCountMap);
+        model.addAttribute("totalFirstWeekCount", totalFirstWeekCount);
+        model.addAttribute("totalTargetedCount", totalTargetedCount);
+        model.addAttribute("totalSecondWeekCount", totalSecondWeekCount);
+        model.addAttribute("totalThirdWeekCount", totalThirdWeekCount);
+        model.addAttribute("totalFourthWeekCount", totalFourthWeekCount);
+        model.addAttribute("totalMtdCount", totalMtdCount);
+        model.addAttribute("totalZeroBilledCount", totalZeroBilledCount);
         return "rbm-today-arr";
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java – Rev 34114 → 34119