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

         if (leadStatus.contains(LeadStatus.All)) {
             leadStatus.add(LeadStatus.pending);
             leadStatus.add(LeadStatus.notInterested);
             leadStatus.add(LeadStatus.finalized);
+            // NOTE: do NOT add followUp here. Follow-ups are pulled separately (undated) below,
+            // mirroring the on-screen view. Adding it here made the date query get skipped so the
-            leadStatus.add(LeadStatus.followUp);
+            // download collapsed to follow-ups only (original bug).
+        }
         if (color.contains("All")) {
             color.add("yellow");
             color.add("green");
+        }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
                     leads.addAll(leadFollowUp);
+                }
             } else {
-                // Date range selected: return ALL selected statuses (including follow-up) created within [start, end].
+                // Date range: non-follow-up statuses created within [start, end], PLUS all follow-ups
-                // Follow-up is now date-bounded via this same query instead of pulling every follow-up ever,
+                // (undated) — mirrors the on-screen view so the CSV matches what the user sees.
-                // which previously made a date-range download ignore the dates and drop non-follow-up statuses.
+                if (!leadStatus.contains(LeadStatus.followUp)) {
-                leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDateAndAuthIds(leadStatus, authUserIds, color, startDateTime, endDateTime);
+                    leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDateAndAuthIds(leadStatus, authUserIds, color, startDateTime, endDateTime);
+                }
+                if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
+                    leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
+                    leads.addAll(leadFollowUp);
+                }
+            }
         } else {
             if (startDateTime == null) {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
                     leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, LocalDateTime.now().minusMonths(1));
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
                     leads.addAll(leadFollowUp);
+                }
             } else {
-                // Date range selected: return ALL selected statuses (including follow-up) created within [start, end].
+                // Date range: non-follow-up statuses created within [start, end], PLUS all follow-ups
+                // (undated) — mirrors the on-screen view.
+                if (!leadStatus.contains(LeadStatus.followUp)) {
-                leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDate(leadStatus, color, startDateTime, endDateTime);
+                    leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDate(leadStatus, color, startDateTime, endDateTime);
+                }
+                if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
+                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
+                    leads.addAll(leadFollowUp);
+                }
+            }
+        }
         // Build activity map and auth map (SAME AS VIEW ENDPOINT)
+        // Guard both lookups on a non-empty result: an empty list would generate an invalid
+        // "IN ()" and 500 (e.g. a date range with no leads), so an empty range yields an empty CSV.
+        Map<Integer, AuthUser> authIdAndAuthUserMap = new HashMap<>();
         if (!leads.isEmpty()) {
             List<Integer> leadIds = leads.stream().map(Lead::getId).collect(Collectors.toList());
             leadActivityMap = leadActivityRepository.selectAllByleadIds(leadIds).stream()
                     .collect(Collectors.groupingBy(LeadActivity::getLeadId));
+            List<Integer> authIds = leads.stream().map(Lead::getAssignTo).collect(Collectors.toList());
+            authIdAndAuthUserMap = authRepository.selectByIds(authIds).stream()
+                    .collect(Collectors.toMap(AuthUser::getId, x -> x));
+        }
-        List<Integer> authIds = leads.stream().map(Lead::getAssignTo).collect(Collectors.toList());
-        Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectByIds(authIds).stream()
-                .collect(Collectors.toMap(AuthUser::getId, x -> x));
         // Build CSV rows (USE DIRECT LEAD PROPERTIES - NO ACTIVITY FALLBACK)
         List<List<?>> rows = new ArrayList<>();
         for (Lead lead : leads) {
             List<LeadActivity> activities = leadActivityMap.get(lead.getId());
         return "lead-close-paginated";
+    }
+    // Global lead search box: find ANY lead by name / mobile / outlet / city, no date filter needed.
+    @RequestMapping(value = "/globalLeadSearch")
+    public String globalLeadSearch(HttpServletRequest request,
+                                   @RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm,
+                                   Model model) {
+        List<Lead> leads = new ArrayList<>();
+        if (!searchTerm.trim().isEmpty()) {
+            leads = leadRepository.selectByGlobalSearch(searchTerm.trim(), 200);
+            if (!leads.isEmpty()) {
+                List<Integer> authIds = leads.stream().map(Lead::getAssignTo).collect(Collectors.toList());
+                Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectByIds(authIds).stream()
+                        .collect(Collectors.toMap(AuthUser::getId, x -> x));
+                model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+            }
+        }
+        model.addAttribute("leads", leads);
+        model.addAttribute("searchTerm", searchTerm);
+        return "lead-close-paginated";
+    }
     @RequestMapping(value = "/getLeadActivity", method = RequestMethod.GET)
     public String getLeadActivity(HttpServletRequest request, @RequestParam int leadId, Model model) throws Exception {
         List<LeadActivity> leadActivity = leadActivityRepository.selectBYLeadId(leadId);
         LOGGER.info("leadActivity" + leadActivity);

Subversion Repositories SmartDukaan

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