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

                     filteredPtams = ptams;
+                }
                 tm.setRBMAndL1(isRBMAndL1);
                 tm.setRBMAndNotL1(isRBMAndNotL1);
                 tm.setSales(isSales);
-                tm.setTargetAchievement(filteredPtams.stream().sorted(Comparator.comparing(PartnerTargetAchievementModel::getRank))
+                /*tm.setTargetAchievement(filteredPtams.stream().sorted(Comparator.comparing(PartnerTargetAchievementModel::getRank))
+                        .collect(Collectors.toList()));*/
+                tm.setTargetAchievement(filteredPtams.stream()
+                        .sorted(Comparator
+                                .comparing((PartnerTargetAchievementModel ptam) -> {
+                                    LocalDate remarkDate = ptam.getRemarkTimestamp() != null
+                                            ? ptam.getRemarkTimestamp().toLocalDate()
+                                            : null;
+                                    return remarkDate != null && remarkDate.equals(LocalDate.now());
+                                }) // false → comes first, true (today) → goes last
+                                .thenComparing(PartnerTargetAchievementModel::getRank)
+                        )
                         .collect(Collectors.toList()));
+            }
+        }
         return responseSender.ok(tm);
+    }
     //TODO:Amit

Subversion Repositories SmartDukaan