WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java

                 List<Integer> fofoIds = new ArrayList<>(storeGuyMap.get(au.getEmailId()));
                 allFofoIds.addAll(fofoIds);
                 rbmToFofoIdsMap.put(rbmAuthId, fofoIds);
+            }
+        }
-        // Fetch escalated tickets for L2 early so their fofoIds are included in batch fetches
+        // Initialize L2 calling list map - will be populated after fetching remarks
-        List<Ticket> escalatedTickets = Collections.emptyList();
         Map<Integer, List<Integer>> l2AuthIdToFofoIds = new HashMap<>();
-        if (!l2AuthIds.isEmpty()) {
-            start = System.currentTimeMillis();
-            escalatedTickets = ticketRepository.selectOpenEscalatedTicketsByAuthIds(l2AuthIds);
-            LOGGER.info("RBM Call Target - Escalated tickets fetch: {}ms, count: {}", System.currentTimeMillis() - start, escalatedTickets.size());
-            for (int l2AuthId : l2AuthIds) {
+        for (int l2AuthId : l2AuthIds) {
-                List<Integer> l2FofoIds = escalatedTickets.stream()
-                        .filter(t -> t.getL2AuthUser() == l2AuthId
-                                || t.getL3AuthUser() == l2AuthId
-                                || t.getL4AuthUser() == l2AuthId
-                                || t.getL5AuthUser() == l2AuthId)
-                        .map(Ticket::getFofoId)
-                        .distinct()
-                        .collect(Collectors.toList());
-                l2AuthIdToFofoIds.put(l2AuthId, l2FofoIds);
+            l2AuthIdToFofoIds.put(l2AuthId, new ArrayList<>());
-                allFofoIds.addAll(l2FofoIds);
-            }
+        }
         LOGGER.info("RBM Call Target - Total fofo IDs to process: {}", allFofoIds.size());
         // Get only needed fofo stores (OPTIMIZED - was fetching ALL stores before)
         start = System.currentTimeMillis();
                         .collect(Collectors.toMap(PartnerCollectionRemark::getFofoId, x -> x, (a, b) -> a));
+            }
+        }
         LOGGER.info("RBM Call Target - PartnerCollectionRemarks fetch: {}ms", System.currentTimeMillis() - start);
+        // Populate L2 calling list based on partners whose latest remark is RBM_L2_ESCALATION
+        // Find the L1 who has the partner and add to that L1's manager (L2) calling list
+        for (Map.Entry<Integer, PartnerCollectionRemark> entry : allPartnerCollectionRemarks.entrySet()) {
+            Integer fofoId = entry.getKey();
+            PartnerCollectionRemark remark = entry.getValue();
+            if (CollectionRemark.RBM_L2_ESCALATION.equals(remark.getRemark())) {
+                // Find which L1 RBM has this partner assigned
+                for (int l1AuthId : l1AuthIds) {
+                    List<Integer> l1FofoIds = rbmToFofoIdsMap.getOrDefault(l1AuthId, Collections.emptyList());
+                    if (l1FofoIds.contains(fofoId)) {
+                        // Get L1's manager (L2)
+                        AuthUser l1User = authUserMap.get(l1AuthId);
+                        if (l1User != null && l2AuthIdToFofoIds.containsKey(l1User.getManagerId())) {
+                            int l2ManagerId = l1User.getManagerId();
+                            l2AuthIdToFofoIds.get(l2ManagerId).add(fofoId);
+                        }
+                        break; // Found the L1 for this fofoId
+                    }
+                }
+            }
+        }
+        LOGGER.info("RBM Call Target - L2 calling lists populated from RBM_L2_ESCALATION remarks");
         // Batch fetch collection RANK map for all fofoIds (OPTIMIZED - only fetches rank, not full model)
         start = System.currentTimeMillis();
         Map<Integer, Integer> allCollectionRankMap = new HashMap<>();
         if (!allFofoIds.isEmpty()) {
             try {
                 continue;
+            }
             List<Integer> l2FofoIdList = l2AuthIdToFofoIds.getOrDefault(l2AuthId, Collections.emptyList());
-            // For L2, use all escalated ticket fofoIds as target (no collection plan filter)
+            // For L2, use unique fofoIds with RBM_L2_ESCALATION remark as target
             Set<Integer> l2TargetFofoIds = new HashSet<>(l2FofoIdList);
             RbmCallTargetModel l2Model = new RbmCallTargetModel();
             l2Model.setAuthId(l2AuthId);
             l2Model.setRbmName(authUser.getFullName() + " (L2)");
             l2Model.setL2Position(true);
-            l2Model.setL2CallingList(l2FofoIdList.size());
+            l2Model.setL2CallingList(l2TargetFofoIds.size());
             // Partner count = total assigned partners (same as L1 source)
             List<Integer> l2AssignedFofoIds = rbmToFofoIdsMap.getOrDefault(l2AuthId, Collections.emptyList());
             l2Model.setPartnerCount(l2AssignedFofoIds.size());
-            // L2 Target = all escalated ticket fofoIds
+            // L2 Target = partners with RBM_L2_ESCALATION as latest remark
             l2Model.setTodayTargetOfCall(l2TargetFofoIds.size());
-            // Value Achieved = distinct fofoIds from today's remarks that are in escalated tickets
+            // Value Achieved = distinct fofoIds from today's remarks that are in L2's calling list
             List<PartnerCollectionRemark> l2TodayRemarks = remarksByAuthId.getOrDefault(l2AuthId, Collections.emptyList());
             long l2ValueAchieved = l2TodayRemarks.stream()
                     .map(PartnerCollectionRemark::getFofoId)
                     .filter(l2TargetFofoIds::contains)
                     .distinct()

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java – Rev 35763 → 35816