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

                             || t.getL5AuthUser() == authId)
                     .map(Ticket::getFofoId)
                     .distinct()
                     .collect(Collectors.toList());
-            // For L2, all escalated tickets are target
-            Set<Integer> targetFofoIds = new HashSet<>(fofoIdList);
-            // Get today's remarks
+            // Get today's remarks created by L2
             List<PartnerCollectionRemark> todayRemarks = partnerCollectionRemarkRepository
                     .selectAllByAuthIdsOnDate(Collections.singletonList(authId), today);
-            // Filter to only target partners and deduplicate
+            // Deduplicate by fofoId - keep latest remark per partner (list is ordered by id DESC)
             Map<Integer, PartnerCollectionRemark> uniqueRemarksByFofoId = new LinkedHashMap<>();
             for (PartnerCollectionRemark remark : todayRemarks) {
-                if (targetFofoIds.contains(remark.getFofoId())) {
-                    uniqueRemarksByFofoId.putIfAbsent(remark.getFofoId(), remark);
+                uniqueRemarksByFofoId.putIfAbsent(remark.getFofoId(), remark);
-                }
+            }
             return buildCalledPartnerResult(uniqueRemarksByFofoId);
+        }
                 targetFofoIds.add(fofoId);
+            }
             // rank 4 (FuturePlan) and rank 5 (Normal) are NOT in target
+        }
-        // Get today's remarks
+        // Get today's remarks created by L1
         List<PartnerCollectionRemark> todayRemarks = partnerCollectionRemarkRepository
                 .selectAllByAuthIdsOnDate(Collections.singletonList(authId), today);
-        // Filter to only target partners and deduplicate
+        // Deduplicate by fofoId - keep latest remark per partner (list is ordered by id DESC)
         Map<Integer, PartnerCollectionRemark> uniqueRemarksByFofoId = new LinkedHashMap<>();
         for (PartnerCollectionRemark remark : todayRemarks) {
-            if (targetFofoIds.contains(remark.getFofoId())) {
-                uniqueRemarksByFofoId.putIfAbsent(remark.getFofoId(), remark);
+            uniqueRemarksByFofoId.putIfAbsent(remark.getFofoId(), remark);
-            }
+        }
         return buildCalledPartnerResult(uniqueRemarksByFofoId);
+    }

Subversion Repositories SmartDukaan

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