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

 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
 import org.apache.commons.csv.CSVRecord;
+import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
         return cm;
+    }
     @RequestMapping(value = "/downloadDateWiseLead", method = RequestMethod.GET)
-    public ResponseEntity<?> getdownloadLeadDataByDate(HttpServletRequest request, @RequestParam(name = "leadStatus", required = false, defaultValue = "All") List<LeadStatus> leadStatus, @RequestParam(name = "color", required = false, defaultValue = "All") List<String> color, @RequestParam(name = "leadDate", required = false, defaultValue = "") LocalDate leadDate, Model model) throws Exception {
+    public ResponseEntity<?> getdownloadLeadDataByDate(HttpServletRequest request,
+                                                       @RequestParam(name = "leadStatus", required = false, defaultValue = "All") List<LeadStatus> leadStatus,
+                                                       @RequestParam(name = "color", required = false, defaultValue = "All") List<String> color,
+                                                       @RequestParam(name = "leadDate", required = false, defaultValue = "") LocalDate leadDate) throws Exception {
         LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
         String emailId = fofoDetails.getEmailId();
         LocalDateTime localDateTime = null;
         if (leadDate != null) {
             localDateTime = leadDate.atStartOfDay();
+        }
         List<Lead> leads = new ArrayList<>();
         AuthUser authUser = authRepository.selectByEmailOrMobile(emailId);
+        if (leadStatus.contains(LeadStatus.All)) {
-        model.addAttribute("colors", color);
+            leadStatus.add(LeadStatus.pending);
+            leadStatus.add(LeadStatus.notInterested);
+            leadStatus.add(LeadStatus.finalized);
+        }
+        if (color.contains("All")) {
+            color.add("yellow");
+            color.add("green");
+        }
         Map<Integer, List<LeadActivity>> leadActivityMap = new HashMap<>();
         boolean authPositon = positionRepository.hasCategory(authUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_SALES);
         List<Integer> authUserIds = null;
-        LOGGER.info("color111" + color);
         List<Lead> leadFollowUp = new ArrayList<>();
         if (authPositon) {
             authUserIds = authService.getAllReportees(authUser.getId());
             authUserIds.add(authUser.getId());
-            LOGGER.info("authIds" + authUserIds);
-            LOGGER.info("leadStatus" + leadStatus);
             if (localDateTime == null) {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
                     leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds, color, LocalDateTime.now().minusMonths(1));
+                }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
                     leads.addAll(leadFollowUp);
+                }
             } else {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
                     leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds, color, localDateTime);
+                }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
                     leads.addAll(leadFollowUp);
+                }
+            }
         } else {
             if (localDateTime == 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);
+                }
-                LOGGER.info("leadlocalDateTime1" + leads);
             } else {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
                     leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, localDateTime);
+                }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
                     leads.addAll(leadFollowUp);
+                }
-                LOGGER.info("leadlocalDateTime2" + leads);
+            }
+        }
-        leadActivityMap = leadActivityRepository.selectAllByleadIds(leads.stream().map(x -> x.getId()).collect(Collectors.toList())).stream().collect(Collectors.groupingBy(LeadActivity::getLeadId, Collectors.toList()));
-        List<Integer> authIds = new ArrayList<>();
+        // Build activity map and auth map (SAME AS VIEW ENDPOINT)
         if (!leads.isEmpty()) {
-            authIds.addAll(leads.stream().map(x -> x.getAssignTo()).collect(Collectors.toList()));
+            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());
-        Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
+        Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(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());
+            // Use FIRST activity's schedule timestamp if exists
             String scheduleTimestamp = (activities != null && !activities.isEmpty())
                     ? FormattingUtils.format(activities.get(0).getSchelduleTimestamp())
-                    : null;
+                    : "";
+            // DIRECTLY use Lead properties (NO fallback to activity)
-            Double potental = 0d;
+            Double potential = lead.getPotential();
-            String outLetName = "";
+            String outLetName = lead.getOutLetName() != null ? lead.getOutLetName() : "";
-            if (lead.getPotential() >= 0) {
+            // Assignee name (blank if missing)
-                potental = lead.getPotential();
+            String assignTo = "";
-            } else if (activities != null && !activities.isEmpty()) {
+            if (authIdAndAuthUserMap.containsKey(lead.getAssignTo())) {
-                potental = activities.get(0).getPotential();
+                AuthUser user = authIdAndAuthUserMap.get(lead.getAssignTo());
+                assignTo = (user.getFirstName() + " " + user.getLastName()).trim();
-            } else potental = 0d;
+            }
+            rows.add(Arrays.asList(
+                    lead.getSource(),
-            if (lead.getOutLetName() != null) {
+                    lead.getFullName(),
+                    outLetName,
+                    potential,
-                outLetName = lead.getOutLetName();
+                    lead.getLeadMobile(),
-            } else if (activities != null && !activities.isEmpty()) {
+                    lead.getAddress() != null ? lead.getAddress() : "",
-                outLetName = activities.get(0).getOutletName();
+                    lead.getCity() != null ? lead.getCity() : "",
-            } else outLetName = "-";
+                    lead.getState() != null ? lead.getState() : "",
+                    lead.getCreatedBy() != null ? lead.getCreatedBy() : "",
-            String assignTo = "-";
+                    lead.getStatus().toString(),
-            if (authIdAndAuthUserMap.get(lead.getAssignTo()) != null) {
+                    FormattingUtils.format(lead.getCreatedTimestamp()),
-                assignTo = authIdAndAuthUserMap.get(lead.getAssignTo()).getFirstName() + " " + authIdAndAuthUserMap.get(lead.getAssignTo()).getLastName();
+                    FormattingUtils.format(lead.getUpdatedTimestamp()),
-            } else assignTo = "-";
+                    scheduleTimestamp,
-            rows.add(Arrays.asList(lead.getSource(), lead.getFullName(), outLetName, potental, lead.getLeadMobile(),
+                    lead.getClosureTimestamp() != null
-                    lead.getAddress(), lead.getCity(), lead.getState(), lead.getCreatedBy(), lead.getStatus(),
+                            ? FormattingUtils.format(lead.getClosureTimestamp())
+                            : "",  // Handle null closure
+                    assignTo,
-                    FormattingUtils.format(lead.getCreatedTimestamp()), FormattingUtils.format(lead.getUpdatedTimestamp()), scheduleTimestamp, FormattingUtils.format(lead.getClosureTimestamp()), assignTo, lead.getColor()));
+                    lead.getColor() != null ? lead.getColor() : ""
+            ));
+        }
-//        #if($leadActivityMap.get($lead.getId()).get(0).getSchelduleTimestamp())
-        org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(
-                Arrays.asList("Source", "Partner Name", "Outlet Name", "Potential", "Mobile", "Address", "City", "State",
-                        "Created By", "Status", "Created On", "Updated On", "Scheduled Timestamp", "Closure Timestamp", "Assign To", "Color"
-                ),
-                rows);
-        ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "Lead Details ");
-        return responseEntity;
+        // Generate CSV response
+        ByteArrayOutputStream baos = FileUtil.getCSVByteStream(
+                Arrays.asList("Source", "Partner Name", "Outlet Name", "Potential", "Mobile", "Address", "City", "State",
+                        "Created By", "Status", "Created On", "Updated On", "Scheduled Timestamp",
+                        "Closure Timestamp", "Assign To", "Color"),
+                rows
+        );
+        return orderService.downloadReportInCsv(baos, rows, "LeadDetails_");
+    }
     @RequestMapping(value = "/getClosedLead", method = RequestMethod.GET)
     public String getClosedLead(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, @RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model) throws Exception {
         List<AuthUser> authUsers = authRepository.selectAllActiveUser();
         List<Lead> leads = null;
         long size = 0;

Subversion Repositories SmartDukaan

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