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

     /** Most-recent weeks shown in the SLA owner heat-map. */
     private static final int HEATMAP_WEEKS = 6;
     /** Cap on rows returned to a drill-down drawer. Public so the drawer can say it is showing a slice. */
+    /** Default drawer page size (drill) and the hard cap on search results. */
     public static final int DRILL_LIMIT = 100;
     @Autowired
     private LeadRepository leadRepository;
     @Autowired
     private LeadLiveLocationRepository leadLiveLocationRepository;
     // ---- Command Center + shared summary ----------------------------------------------------
+    /**
-    /** KPIs + lifecycle funnel + attention queue for the given region / created-date window. */
+     * KPIs + lifecycle funnel + attention queue for the given region / created-date window. Stages come
+     * from LeadRepository's evidence-aware expression: BEAT_PLANNED / VISITED / ONBOARDED are read off
+     * lead_route, location_tracking and LOI + stock payment, never off the hand-set stage column.
+     */
     public Map<String, Object> summary(Integer regionId, LocalDateTime from, LocalDateTime to) {
         Map<String, Long> stage = toCountMap(leadRepository.countByDerivedStage(regionId, from, to));
         long total = 0;
         for (Long v : stage.values()) {
             total += v;
+            }
             reached[i] = sum;
+        }
         LocalDateTime now = LocalDateTime.now();
-        Object[] att = leadRepository.attentionCounts(regionId, now, now.plusHours(1));
+        Object[] att = leadRepository.attentionCounts(regionId, now, now.plusHours(1), from, to);
         long breachedNoContact = num(att, 0);
         long hold = num(att, 1);
         long slaUnder1h = num(att, 2);
         long missingDisp = num(att, 3);
         long qualifiedNoBeat = num(att, 4);
         kpis.add(kpi("awaiting", "Awaiting 1st contact", assigned, "SLA 3–5 hrs running", "amber"));
         kpis.add(kpi("sla", "SLA at risk / breached", breachedNoContact + slaUnder1h,
                 breachedNoContact + " breached · " + slaUnder1h + " < 1 hr left", "red"));
         kpis.add(kpi("contacted", "Contacted", contacted, "dispositioned", "navy"));
         kpis.add(kpi("qualified", "Qualified", qualified, "value validated", "navy"));
-        kpis.add(kpi("onboarded", "Onboarded", onboarded, "of " + total + " in scope", "good"));
+        kpis.add(kpi("onboarded", "Onboarded", onboarded, "LOI + stock payment · of " + total + " in scope", "good"));
         // Lifecycle funnel.
         List<Map<String, Object>> funnel = new ArrayList<>();
         long topN = total > 0 ? total : 1;
         // Top of funnel = every lead in scope.
             for (Long v : stage.values()) {
                 total += v;
+            }
             long contacted = reachedAtLeast(stage, LeadStage.CONTACTED);
             long qualified = reachedAtLeast(stage, LeadStage.QUALIFIED);
+            long beatPlanned = reachedAtLeast(stage, LeadStage.BEAT_PLANNED);
             long visited = reachedAtLeast(stage, LeadStage.VISITED);
             long onboarded = reachedAtLeast(stage, LeadStage.ONBOARDED);
             Map<String, Object> r = new LinkedHashMap<>();
             r.put("regionCode", code);
             r.put("regionName", nameByCode.getOrDefault(code, "UNMAPPED".equals(code) ? "Unmapped" : code));
             r.put("newCount", total);
             r.put("contacted", contacted);
             r.put("qualified", qualified);
+            r.put("beatPlanned", beatPlanned);
             r.put("visited", visited);
             r.put("onboarded", onboarded);
             r.put("convPct", pct(onboarded, total));
             r.put("slaPct", slaByRegion.getOrDefault(code, 0));
             rows.add(r);
      */
     public Map<String, Object> auditHygiene(LocalDateTime from, LocalDateTime to) {
         LocalDateTime now = LocalDateTime.now();
         Map<String, Object> m = new LinkedHashMap<>();
-        // Same source the Command Center's attention tiles use, so the two cannot disagree.
+        // Same source and same created-date window as the Command Center's attention tiles, so the
+        // two cannot disagree.
-        Object[] att = leadRepository.attentionCounts(null, now, now.plusHours(1));
+        Object[] att = leadRepository.attentionCounts(null, now, now.plusHours(1), from, to);
         m.put("slaBreached", num(att, 0));
         m.put("hold", num(att, 1));
         m.put("missingDisposition", num(att, 3));
         m.put("dndRegister", leadDndRepository.count());
         return v instanceof LocalDateTime ? (LocalDateTime) v : null;
+    }
     // ---- Drill-down -------------------------------------------------------------------------
+    /**
-    /** Lead rows for a drill bucket, shaped for the drawer table. */
+     * One page of lead rows for a drill bucket, shaped for the drawer table, plus the true total so
+     * the drawer can page through every lead behind a bar instead of stopping at the first 100.
+     */
-    public List<Map<String, Object>> drill(String bucketType, String bucketKey, Integer regionId,
+    public Map<String, Object> drill(String bucketType, String bucketKey, Integer regionId,
-                                            LocalDateTime from, LocalDateTime to) {
+                                     LocalDateTime from, LocalDateTime to, int page, int pageSize) {
+        int size = Math.min(Math.max(pageSize, 1), MAX_PAGE_SIZE);
+        int p = Math.max(page, 1);
         String type = bucketType == null ? "" : bucketType.trim().toUpperCase();
         String key = bucketKey;
         // The funnel asks for a stage cumulatively -- "reached CONTACTED" means CONTACTED or anything
         // beyond it, which is exactly how the bar was counted. Expand it here, where the happy path
         // already lives, rather than teaching the repository the order of the lifecycle.
         if ("STAGE_REACHED".equals(type)) {
             type = "STAGE_IN";
             key = stagesFrom(bucketKey);
+        }
         LocalDateTime now = LocalDateTime.now();
+        long total = leadRepository.countLeadsForBucket(type, key, regionId, now, now.plusHours(1), from, to);
         List<Integer> ids = leadRepository.selectLeadIdsForBucket(type, key, regionId,
-                now, now.plusHours(1), from, to, DRILL_LIMIT);
+                now, now.plusHours(1), from, to, (p - 1) * size, size);
-        List<Map<String, Object>> out = new ArrayList<>();
+        List<Map<String, Object>> rows = new ArrayList<>();
+        Map<String, Object> out = new LinkedHashMap<>();
+        out.put("leads", rows);
+        out.put("total", total);
+        out.put("page", p);
+        out.put("pageSize", size);
+        out.put("pages", (int) Math.ceil(total / (double) size));
         if (ids == null || ids.isEmpty()) {
             return out;
+        }
         // selectAllByIds returns id-desc; preserve the bucket's newest-first order.
         Map<Integer, Lead> leadById = new HashMap<>();
             Lead l = leadById.get(id);
             if (l != null) {
                 ordered.add(l);
+            }
+        }
-        return toRows(ordered);
+        rows.addAll(toRows(ordered));
+        return out;
+    }
     /**
      * The given stage and every stage after it on the happy path, comma-separated -- the set the
      * cumulative funnel bar counted. An unrecognised stage (a terminal one such as NOT_INTERESTED,
         if (!ownerIds.isEmpty()) {
             for (AuthUser u : authRepository.selectByIds(new ArrayList<>(ownerIds))) {
                 owners.put(u.getId(), u);
+            }
+        }
+        // Evidence-aware stage in one batch, so a row says the same thing as the bar it came from.
+        List<Integer> leadIds = new ArrayList<>(leads.size());
+        for (Lead l : leads) {
+            leadIds.add(l.getId());
+        }
+        Map<Integer, String> stages = leadRepository.selectEffectiveStages(leadIds);
         for (Lead l : leads) {
-            LeadStage eff = l.getEffectiveStage();
+            LeadStage eff = effectiveStage(l, stages);
             AuthUser owner = owners.get(l.getAssignTo());
             Map<String, Object> r = new LinkedHashMap<>();
             r.put("id", l.getId());
             r.put("lmsCode", l.getLmsCode() != null ? l.getLmsCode() : ("Lead #" + l.getId()));
             r.put("name", trimName(l.getFirstName(), l.getLastName()));
     public Map<String, Object> record(int leadId) {
         Lead l = leadRepository.selectById(leadId);
         if (l == null) {
             return null;
+        }
-        LeadStage eff = l.getEffectiveStage();
+        LeadStage eff = effectiveStage(l, leadRepository.selectEffectiveStages(java.util.Collections.singletonList(leadId)));
         int stageIndex = -1;
         for (int i = 0; i < FUNNEL.length; i++) {
             if (FUNNEL[i] == eff) {
                 stageIndex = i;
+            }
         String f = first == null ? "" : first.trim();
         String l = last == null ? "" : last.trim();
         return (f + " " + l).trim();
+    }
+    /**
+     * The dashboard's stage for a lead: the evidence-aware SQL value when the batch has it, else the
+     * column-only fallback (a lead deleted between the two queries, or an unparseable value).
+     */
+    private LeadStage effectiveStage(Lead l, Map<Integer, String> stages) {
+        LeadStage fromSql = stages == null ? null : safeStage(stages.get(l.getId()));
+        return fromSql != null ? fromSql : l.getEffectiveStage();
+    }
     private LeadStage safeStage(String s) {
+        if (s == null) {
+            return null;
+        }
         try {
             return LeadStage.valueOf(s);
         } catch (Exception e) {
             return null;
+        }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LmsDashboardService.java – Rev 37743 → 37749